diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Configs/database.config b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Configs/database.config
index 5f53c3e5d38dd182df18aa46744c9de8aeed5bdf..2381e253c8732ca1bb3a3061b31e3e9967756e1b 100644
--- a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Configs/database.config
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Configs/database.config
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
 
-	<add name="BaseDbContext" connectionString="Server=192.168.22.5,1433;Initial Catalog=NewtouchHIS_Base;User ID=sa;Password=a1b2c3d4*" providerName="System.Data.SqlClient" />
-	<add name="DbHelperSQL.DefaultConn" connectionString="Server=192.168.22.5,1433;Initial Catalog=NewtouchHIS_Base;User ID=sa;Password=a1b2c3d4*" providerName="System.Data.SqlClient" />
+	<add name="BaseDbContext" connectionString="Server=1.183.188.77;Initial Catalog=NewtouchHIS_Base;User ID=sa;Password=a1b2c3d4*" providerName="System.Data.SqlClient" />
+	<add name="DbHelperSQL.DefaultConn" connectionString="Server=1.183.188.77;Initial Catalog=NewtouchHIS_Base;User ID=sa;Password=a1b2c3d4*" providerName="System.Data.SqlClient" />
 
 	<!-- Redis -->
 	<!-- 云服务器 -->
-	<add name="RedisServer" connectionString="192.168.22.5:6379,connectTimeout=500" />
+  <add name="RedisServer" connectionString="D4A0810795BFABD5DF6D3B4D3A7FF0F03AD6996F3A909BF54748AFF78429F89697C20DDD02726669205CBC798E4C1EB7C73A01D4435A9AA3" />
+
+  <!--<add name="RedisServer" connectionString="192.168.22.5:6379,connectTimeout=500" />-->
 </connectionStrings>
\ No newline at end of file
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Configs/system.config b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Configs/system.config
index 556b06f5c45c7b4dcc3ec6beda6f911d7a9b6a90..6430d17d372cb73d91f311032b18fbd3f6081e8a 100644
--- a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Configs/system.config
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Configs/system.config
@@ -25,14 +25,14 @@
 	<!-- 应用Id -->
 	<add key="AppId" value="newtouch.base.web"/>
 	<!-- 页面domain（嵌套其他域页面，并执行js 要设置成同一域）-->
-	<add key="Document_Domain" value="61.172.179.73"/>
+	<add key="Document_Domain" value="1.183.188.77"/>
 
 	<!-- SETTAPI地址-统一授权用户身份换取 -->
 	<add key="UAUserInfoGetAPI" value="http://192.168.22.5:7022/api/UA/GetUserInfo"/>
 
 
 	<!-- 静态站点的Host -->
-	<add key="SiteStaticHost" value="http://192.168.22.5:8014/"/>
+  <add key="SiteStaticHost" value="http://1.183.188.77:8011/"/>
 
 	<!-- 日志服务的Url --><!--
 	<add key="His.Log.URL" value="http://61.172.179.30:1703/"/>-->
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Controllers/PharmacyDrugStorage/SysMedicineElectronicPrescriptionController.cs b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Controllers/PharmacyDrugStorage/SysMedicineElectronicPrescriptionController.cs
index d000a340a9479a8aca56cc055e4c42ecba07e2b0..fd8417850bd512d63dd227c1d90bd1e024a97eaa 100644
--- a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Controllers/PharmacyDrugStorage/SysMedicineElectronicPrescriptionController.cs
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Controllers/PharmacyDrugStorage/SysMedicineElectronicPrescriptionController.cs
@@ -26,11 +26,11 @@ namespace Newtouch.HIS.Base.HOSP.Controllers.PharmacyDrugStorage
 
         [HttpGet]
         [HandlerAjaxOnly]
-        public ActionResult GetGridJson(Pagination pagination, string genname, string medListCodg)
+        public ActionResult GetGridJson(Pagination pagination, string genname, string medListCodg,string listType,string zt)
         {
             var data = new
             {
-                rows = _sysMedicineElectronicPrescriptionDmnService.GetPaginationList(pagination, genname,  medListCodg),
+                rows = _sysMedicineElectronicPrescriptionDmnService.GetPaginationList(pagination, genname,  medListCodg,listType,zt),
                 total = pagination.total,
                 page = pagination.page,
                 records = pagination.records
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicineElectronicPrescription/Index.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicineElectronicPrescription/Index.cshtml
index 08ce9855b1855b916a3053225ef3fcb539537135..8b1f50866a32a3ccdc0634e84b68d94b0e4ac7ec 100644
--- a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicineElectronicPrescription/Index.cshtml
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicineElectronicPrescription/Index.cshtml
@@ -6,63 +6,38 @@
     var opr = Newtouch.Common.Operator.OperatorProvider.GetCurrent();
 }
 
-
-<!DOCTYPE html>
-<style>
-    .showbotton {
-        display: none;
-        position: fixed;
-        bottom: 5px;
-        right: 0;
-        z-index: 9999;
-        background-color: #ccc;
-        width: 50px;
-        height: 44px;
-        filter: alpha(Opacity=90);
-        -moz-opacity: 0.9;
-        opacity: 0.9;
-        cursor: pointer;
-        border-radius: 100px 0 0 100px;
-    }
-
-    #TabGrid {
-        width: 100%;
-        position: fixed;
-        bottom: 10px;
-        right: 0;
-        z-index: 8888;
-        background-color: #253443;
-        filter: alpha(Opacity=92);
-        -moz-opacity: 0.92;
-        opacity: 0.92;
-        box-shadow: 0px 2px 10px #909090;
-    }
-
-        #TabGrid > * {
-            filter: alpha(Opacity=92);
-            -moz-opacity: 0.92;
-            opacity: 0.92;
-        }
-</style>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width" />
-    <title>Index</title>
-</head>
-<body>
-
-    <form>
-        <div class="panel panel-default">
+<form>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            筛选信息
+        </div>
+        <div>
             <table class="form">
                 <tr>
 
                     <th class="formTitle">药品名：</th>
                     <td class="formValue" colspan="2">
-                        <input id="genname" type="text" class="form-control" style="width:50%; float:left;" />
+                        <input id="genname" type="text" class="form-control" />
                     </td>
                     <th class="formTitle">国家医保编码：</th>
                     <td class="formValue" colspan="2">
-                        <input id="medListCodg" type="text" class="form-control" style="width:50%; float:left;" />
+                        <input id="medListCodg" type="text" class="form-control" />
+                    </td>
+                    <td class="formTitle">药品类型：</td>
+                    <td class="formValue">
+                        <select class="form-control" id="listType">
+                            <option value="">全部</option>
+                            <option value="101">西药中成药</option>
+                            <option value="102">中药饮片</option>
+                        </select>
+                    </td>
+                    <td class="formTitle">有效标志：</td>
+                    <td class="formValue">
+                        <select class="form-control" id="zt">
+                            <option value="">全部</option>
+                            <option value="0">无效</option>
+                            <option value="1">有效</option>
+                        </select>
                     </td>
                     <td class="formValue title">
                         <input type="button" id="btn_search" class="btn btn-primary" style="margin-left: 10%;" value="查询" />
@@ -73,14 +48,13 @@
 
             </table>
         </div>
-        <div class="gridPanel">
-            <table id="gridList"></table>
-            <div id="gridPager"></div>
-        </div>
-    </form>
-</body>
-</html>
-
+            
+    </div>
+    <div class="gridPanel">
+        <table id="gridList"></table>
+        <div id="gridPager"></div>
+    </div>
+</form>
 
 <script>
     $(function () {
@@ -92,8 +66,8 @@
         var $gridList = $("#gridList");
         $gridList.dataGrid({
             url: "/SysMedicineElectronicPrescription/GetGridJson",
-            height: $(window).height() - 120,
-            postData: { genname: $("#genname").val(), medListCodg: $("#medListCodg").val() },
+            height: $(window).height() - 160,
+            postData: { genname: $("#genname").val(), medListCodg: $("#medListCodg").val(), listType: $("#listType").val(), zt: $("#zt").val() },
             colModel: [
                 { label: '医疗目录编码', name: 'medListCodg', width: 180, align: 'left' },
                 { label: '国家药品编号', name: 'natDrugNo', width: 120, align: 'left' },
@@ -101,7 +75,11 @@
                 { label: '商品名', name: 'prodname', width: 150, align: 'left' },
                 { label: '注册名', name: 'regName', width: 150, align: 'left' },
                 { label: '目录类别', name: 'listType', width: 80, align: 'left' },
-                { label: '目录类别名称', name: 'listTypeName', width: 120, align: 'left' },
+                {
+                    label: '目录类别名称', name: 'listTypeName', width: 120, align: 'left', formatter: function (cellVallue) {
+                        return cellVallue == "" ? "中药饮片" : cellVallue;
+                    }
+                },
                 { label: '规格名称', name: 'specName', width: 100, align: 'left' },
                 { label: '生厂厂家', name: 'prdrName', width: 150, align: 'left' },
                 { label: '批准文号', name: 'aprvno', width: 150, align: 'left' },
@@ -112,7 +90,7 @@
                 { label: '统筹区编号', name: 'poolareaNo', width: 80, align: 'left' },
                 { label: '统筹区名称', name: 'poolareaName', width: 80, align: 'left' },
                 { label: '是否双通道标志', name: 'dualchnlFlag', width: 80, align: 'left' },
-                { label: '是否门诊统筹标志', name: 'oppoolFlag', width: 80, align: 'left' },
+                { label: '是否门诊统筹标志', name: 'oppoolFlag', hidden: true, width: 80, align: 'left' },
                 { label: '开始时间', name: 'begntime', width: 80, align: 'left' },
                 { label: '结束时间', name: 'endtime', width: 80, align: 'left' },
             ],
@@ -123,16 +101,27 @@
         });
         $("#btn_search").click(function () {
             $gridList.jqGrid('setGridParam', {
-                postData: { genname: $("#genname").val(), medListCodg: $("#medListCodg").val() },
+                postData: {
+                    genname: $("#genname").val(), medListCodg: $("#medListCodg").val(),
+                    listType: $("#listType").val(), zt: $("#zt").val()
+                },
             }).trigger('reloadGrid');
         });
     }
 
     //回车事件
-    $('#txt_keyword').keydownEnterEvent(function () {
+    $('#genname').keydownEnterEvent(function () {
+        $('#btn_search').trigger('click');
+    })
+    $('#medListCodg').keydownEnterEvent(function () {
+        $('#btn_search').trigger('click');
+    })
+    $('#listType').change(function () {
+        $('#btn_search').trigger('click');
+    })
+    $('#zt').change(function () {
         $('#btn_search').trigger('click');
     })
-
     //同步
     $('#btn_sync').click(function () {
         $.ajax({
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Domain/IDomainServices/PharmacyDrugStorage/ISysMedicineElectronicPrescriptionDmnService.cs b/Newtouch.HIS.Base/Newtouch.HIS.Domain/IDomainServices/PharmacyDrugStorage/ISysMedicineElectronicPrescriptionDmnService.cs
index 5806496570ccd5d5d1512d08600fa5453eb1aebd..7dbe4774e8fa2be41837f6abeb80a23729d74e2b 100644
--- a/Newtouch.HIS.Base/Newtouch.HIS.Domain/IDomainServices/PharmacyDrugStorage/ISysMedicineElectronicPrescriptionDmnService.cs
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Domain/IDomainServices/PharmacyDrugStorage/ISysMedicineElectronicPrescriptionDmnService.cs
@@ -10,6 +10,6 @@ namespace Newtouch.HIS.Domain.IDomainServices.PharmacyDrugStorage
 {
     public interface ISysMedicineElectronicPrescriptionDmnService
     {
-        IList<SysMedicineElectronicPrescriptionVO> GetPaginationList(Pagination pagination, string genname, string medListCodg);
+        IList<SysMedicineElectronicPrescriptionVO> GetPaginationList(Pagination pagination, string genname, string medListCodg, string listType, string zt);
     }
 }
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Domain/ValueObjects/SysMedicineElectronicPrescriptionVO.cs b/Newtouch.HIS.Base/Newtouch.HIS.Domain/ValueObjects/SysMedicineElectronicPrescriptionVO.cs
index 70fef3096cf90d5948b95c546e74c29021b60e5e..8f0dbed9bbc056e84f3cdac0a24c16d94592b536 100644
--- a/Newtouch.HIS.Base/Newtouch.HIS.Domain/ValueObjects/SysMedicineElectronicPrescriptionVO.cs
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Domain/ValueObjects/SysMedicineElectronicPrescriptionVO.cs
@@ -28,5 +28,6 @@ namespace Newtouch.HIS.Domain.ValueObjects
         public string oppoolFlag { get; set; }
         public string begntime { get; set; }
         public string endtime { get; set; }
+        public string zt { get; set; }
     }
 }
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.DomainServices/PharmacyDrugStorage/SysMedicineElectronicPrescriptionDmnService.cs b/Newtouch.HIS.Base/Newtouch.HIS.DomainServices/PharmacyDrugStorage/SysMedicineElectronicPrescriptionDmnService.cs
index b721b1960fea3cc6485b369b5ba9e95d2eae9a67..917561d3366b4494dccf7924bbf09ce1ecdef624 100644
--- a/Newtouch.HIS.Base/Newtouch.HIS.DomainServices/PharmacyDrugStorage/SysMedicineElectronicPrescriptionDmnService.cs
+++ b/Newtouch.HIS.Base/Newtouch.HIS.DomainServices/PharmacyDrugStorage/SysMedicineElectronicPrescriptionDmnService.cs
@@ -24,7 +24,7 @@ namespace Newtouch.HIS.DomainServices.PharmacyDrugStorage
         /// 获取当前组织下的系统药品信息
         /// </summary>
         /// <returns></returns>
-        public IList<SysMedicineElectronicPrescriptionVO> GetPaginationList(Pagination pagination, string genname, string medListCodg)
+        public IList<SysMedicineElectronicPrescriptionVO> GetPaginationList(Pagination pagination, string genname, string medListCodg, string listType, string zt)
         {
             var sql = @"select * from [NewtouchHIS_Sett]..Dzcf_CFYP_output where 1=1 ";
             if (!string.IsNullOrEmpty(genname))
@@ -33,13 +33,23 @@ namespace Newtouch.HIS.DomainServices.PharmacyDrugStorage
             }
             if (!string.IsNullOrEmpty(medListCodg))
             {
-                sql += @" and medListCodg=@medListCodg";
+                sql += @" and medListCodg like @medListCodg";
+            }
+            if (!string.IsNullOrWhiteSpace(listType))
+            {
+                sql += @" and listType like @listType";
+            }
+            if (!string.IsNullOrWhiteSpace(zt))
+            {
+                sql += @" and zt like @zt";
             }
             DbParameter[] par = new DbParameter[]
-                {
-                    new SqlParameter("@genname", "%"+genname.Trim()+"%"),
-                    new SqlParameter("@medListCodg", medListCodg),
-                };
+            {
+                new SqlParameter("@genname", "%"+genname.Trim()+"%"),
+                new SqlParameter("@medListCodg", "%"+medListCodg+"%"),
+                new SqlParameter("@listType", "%"+listType.Trim()+"%"),
+                new SqlParameter("@zt", "%"+zt+"%"),
+            };
             return this.QueryWithPage<SysMedicineElectronicPrescriptionVO>(sql, pagination,par
             );
         }
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Controllers/WardMaintenanceController.cs b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Controllers/WardMaintenanceController.cs
index 21dbd1196593f321dbb5303cd20d945174ce8108..40dc3c3b1b1e3ae535750df21b48a239e290bae8 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Controllers/WardMaintenanceController.cs
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Controllers/WardMaintenanceController.cs
@@ -23,6 +23,7 @@ namespace Newtouch.CIS.Web.Areas.NurseManage.Controllers
         private readonly IPatientRyDiagnosisApp _patientRyDiagnosisApp;
 		private readonly IInpatientBedCardRepo _InpatientBedCardRepo;
         private readonly ISysDiagnosisRepo _sysDiagnosisRepo;
+        private readonly ISysTCMSyndromeRepo _sysTcmsyndromeRepo;
         public ActionResult WardWardRoomBedMaintenance()
         {
             return View();
@@ -245,23 +246,30 @@ namespace Newtouch.CIS.Web.Areas.NurseManage.Controllers
         /// 中西医诊断
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetryzdSelect(string ryzd, string ybnhlx)
+        public ActionResult GetryzdSelect(string ryzd, string ybnhlx,string zdlb=null)
         {
             if (string.IsNullOrEmpty(ybnhlx))
             {
                 ybnhlx = null;
             }
-            var data = _sysDiagnosisRepo.GetList(this.OrganizeId, ryzd, "WM", ybnhlx);
-            var zydata = _sysDiagnosisRepo.GetList(this.OrganizeId, ryzd, "TCM", ybnhlx);
             List<ZDSelect> zdlist = new List<ZDSelect>();
-            foreach (SysDiagnosisVEntity item in zydata)
+            IList<SysDiagnosisVEntity> data = new List<SysDiagnosisVEntity>();
+            IList<SysTCMSyndromeVEntity> zyzhdata = new List<SysTCMSyndromeVEntity>();
+            if (zdlb == "ZYZH")//中医症候
+            {
+                zyzhdata = _sysTcmsyndromeRepo.GetList(this.OrganizeId, ryzd);
+            }
+            else {
+                data = _sysDiagnosisRepo.GetList(this.OrganizeId, ryzd, zdlb, ybnhlx);
+            }
+            foreach (SysTCMSyndromeVEntity item in zyzhdata)
             {
                 ZDSelect a = new ZDSelect();
-                a.zdbh = item.zdCode;
-                a.icd10 = item.icd10 == null ? "" : item.icd10;
-                a.zdmc = item.zdmc;
+                a.zdbh = item.zhCode;
+                a.icd10 = item.zhCode == null ? "" : item.zhCode;
+                a.zdmc = item.zhmc;
                 a.py = item.py;
-                a.zdnm = item.zdId;
+                a.zdnm = item.zhId;
                 zdlist.Add(a);
             }
             foreach (SysDiagnosisVEntity item in data)
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaDiagnoosis.cshtml b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaDiagnoosis.cshtml
index ef01355505445a1d859f0d41254f49d6fd527178..045723c24cd128c87f2a20efb994f3879e228703 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaDiagnoosis.cshtml
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaDiagnoosis.cshtml
@@ -155,8 +155,8 @@
                 { label: '入院日期', name: 'ryrq', align: 'center', width: 85, formatter: "date", formatoptions: { srcformat: 'Y-m-d H:i:s', newformat: 'Y-m-d' } },
                 { label: '病人性质', name: 'brxz', hidden: true },
                 { label: '费用类型', name: 'brxzmc', align: 'center', width: 80 },
-                { label: '入院诊断', name: 'zzdmc', align: 'center', width: 90 },
-                { label: '出院诊断', name: 'cyzdmc', align: 'center', width: 90 },
+                { label: '入院诊断', name: 'zzdmc', align: 'center', width: 150 },
+                { label: '出院诊断', name: 'cyzdmc', align: 'center', width: 150 },
                 { label: '床位医生', name: 'ysxm', align: 'center', width: 90 },
                 {
                     label: "操作", name: "", align: "center", width: 100,
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaDiagnoosisForm.cshtml b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaDiagnoosisForm.cshtml
index f827a06b62c56f8aecc4e75a900f0a36ee8a2f6b..97607da3a99729977acad5576d88dc92e82abc5e 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaDiagnoosisForm.cshtml
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaDiagnoosisForm.cshtml
@@ -5,88 +5,99 @@
     Layout = "~/Views/Shared/_Form.cshtml";
     var isOpendiag = SysConfigReader.String("Inpatient_OutAre");
 }
-<form id="form1">
-    <div class="panel-default" style="padding-right:10px;">
-        <table id="tablezd" class="form">
-            <tr>
-                <th class="formTitle">诊断时间：</th>
-                <td class="formValue">
-                    <input id="txt_zdsj" type="text" class="form-control input-wdatepicker formClearIgnore" style="width:70%;" onclick="WdatePicker({ dateFmt: 'yyyy-MM-dd' })"
-                           onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function () { RefreshOrder() } })" value="@DateTime.Now.ToString("yyyy-MM-dd ")" />
-                </td>
-                <th class="formTitle"></th>
-                <td class="formValue"></td>
-            </tr>
-            <tr>
+<style>
+    .formTitle span {
+        color: red;
+    }
 
-                <th class="formTitle" style="margin-left:20px;">
-                    <i id="zdCircle" class="fa fa-plus-circle plusToggleCircle" aria-hidden="true" style="width:30px;margin-left: 10px; color: #6ff3ad; font-size: large;"></i>
-                    出院诊断：
-                </th>
-                <td class="formValue" colspan="2">
-                    <input id="txt_cyzddm" type="hidden" />
-                    <input id="txt_cyzd" name="txt_cyzd" type="text" class="form-control required zdinput" />
-                </td>
-                <th class="formTitle">出院情况：</th>
-                <td class="formValue">
-                    <select id="txt_cyqk" name="txt_cyqk" class="form-control " data-EnumType="EnumCYQK"></select>
-                </td>
-            </tr>
-            @*<tr>
-                    <th class="formTitle">辅助诊断1：</th>
-                    <td class="formValue" colspan="2">
-                        <input id="txt_fzzd1dm" type="hidden" />
-                        <input id="txt_fzzd1" name="txt_fzzd1" type="text" class="form-control required zdinput" />
-                    </td>
-                    <th class="formTitle">出院情况1：</th>
+    .tab-content #basicInfo table tr td {
+        border: 0;
+    }
+</style>
+<form id="form1">
+    <div class="container">
+        <ul class="nav nav-tabs" role="tablist" id="myTab">
+            <li role="presentation"><a href="#xyzdInfo" role="tab" data-toggle="tab">西医诊断</a></li>
+            <li role="presentation"><a href="#zyzdInfo" role="tab" data-toggle="tab">中医诊断</a></li>
+        </ul>
+    </div>
+    <div class="tab-content">
+        <div role="tabpanel" class="tab-pane fade in active" id="xyzdInfo">
+            <table id="tablezd" class="form">
+                <tr>
+                    <th class="formTitle">诊断时间：</th>
                     <td class="formValue">
-                        <select id="txt_cyqk1" name="txt_cyqk1" class="form-control " data-EnumType="EnumCYQK"></select>                </td>
+                        <input id="txt_zdsj" type="text" class="form-control input-wdatepicker formClearIgnore" style="width:70%;" onclick="WdatePicker({ dateFmt: 'yyyy-MM-dd' })"
+                               onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function () { RefreshOrder() } })" value="@DateTime.Now.ToString("yyyy-MM-dd ")" />
+                    </td>
+                    <th class="formTitle"></th>
+                    <td class="formValue"></td>
                 </tr>
                 <tr>
-                    <th class="formTitle">辅助诊断2：</th>
-                    <td class="formValue"  colspan="2">
-                        <input id="txt_fzzd2dm" type="hidden" />
-                        <input id="txt_fzzd2" name="txt_fzzd2" type="text" class="form-control required zdinput" />
+
+                    <th class="formTitle" style="margin-left:20px;">
+                        <i id="zdCircle" class="fa fa-plus-circle plusToggleCircle" aria-hidden="true" style="width:30px;margin-left: 10px; color: #6ff3ad; font-size: large;"></i>
+                        出院诊断：
+                    </th>
+                    <td class="formValue" colspan="2">
+                        <input id="txt_cyzddm" type="hidden" />
+                        <input id="txt_cyzd" name="txt_cyzd" type="text" class="form-control required zdinput" />
                     </td>
-                    <th class="formTitle">出院情况2：</th>
+                    <th class="formTitle">出院情况：</th>
                     <td class="formValue">
-                        <select id="txt_cyqk2" name="txt_cyqk2" class="form-control " data-EnumType="EnumCYQK"></select>
+                        <select id="txt_cyqk" name="txt_cyqk" class="form-control " data-EnumType="EnumCYQK"></select>
                     </td>
                 </tr>
+            </table>
+
+        </div>
+        <div id="zyzdInfo" role="tabpanel" class="tab-pane fade in">
+            <table id="tablezyzd" class="form" style="width: 98%; border: 0">
                 <tr>
-                    <th class="formTitle">辅助诊断3：</th>
-                    <td class="formValue"  colspan="2">
-                        <input id="txt_fzzd3dm" type="hidden" />
-                        <input id="txt_fzzd3" name="txt_fzzd3" type="text" class="form-control required zdinput" />
-                    </td>
-                    <th class="formTitle">出院情况3：</th>
+                    <th class="formTitle">诊断时间：</th>
                     <td class="formValue">
-                        <select id="txt_cyqk3" name="txt_cyqk3" class="form-control " data-EnumType="EnumCYQK"></select>
+                        <input id="txt_zyzdsj" type="text" class="form-control input-wdatepicker formClearIgnore" style="width:70%;" onclick="WdatePicker({ dateFmt: 'yyyy-MM-dd' })"
+                               onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function () { RefreshOrder() } })" value="@DateTime.Now.ToString("yyyy-MM-dd ")" />
                     </td>
-                </tr>*@
-            @*<tr>
-                    <th class="formTitle">自定义诊断：</th>
-                    <td class="formValue"  colspan="2">
-                        <textarea id="txt_zdyzd" name="txt_zdyzd" class="form-control zdinput" style="height: 60px;"></textarea>
+                    <th class="formTitle"></th>
+                    <td class="formValue"></td>
+                </tr>
+                <tr>
+
+                    <th class="formTitle" style="margin-left:20px;">
+                        <i id="zyzdCircle" class="fa fa-plus-circle plusToggleCircle" aria-hidden="true" style="width:30px;margin-left: 10px; color: #6ff3ad; font-size: large;"></i>
+                        主病：
+                    </th>
+                    <td class="formValue" colspan="2">
+                        <input id="txt_zycyzddm" type="hidden" />
+                        <input id="txt_zycyzd" name="txt_zycyzd" type="text" class="form-control required zdinput" />
                     </td>
-                    <th class="formTitle">出院情况  <br />自定义：</th>
+                    <th class="formTitle">出院情况：</th>
                     <td class="formValue">
-                        <select id="txt_cyqkzdy" name="txt_cyqkzdy" class="form-control " data-EnumType="EnumCYQK"></select>
+                        <select id="txt_zycyqk" name="txt_zycyqk" class="form-control " data-EnumType="EnumCYQK"></select>
                     </td>
-                </tr>*@
-        </table>
+                </tr>
+
+            </table>
+        </div>
     </div>
 </form>
 <script lang="javascript">
     var isopendiag = '@isOpendiag';
     var ybnhlx = "";
     var brxz = '@ViewBag.brxz';
-    if(isopendiag =="OFF")
+    $('#myTab a:first').tab('show');
+    if(isopendiag =="OFF")//关闭诊断填写  诊断自电子病历病案填写同步
     {
         $("#zdCircle").css("display", "none");
         $("#txt_cyzd").attr("disabled", true);
         $("#txt_cyqk").attr("disabled", true);
         $("#txt_zdsj").attr("disabled", true);
+
+        $("#zyzdCircle").css("display", "none");
+        $("#txt_zycyzd").attr("disabled", true);
+        $("#txt_zycyqk").attr("disabled", true);
+        $("#txt_zyzdsj").attr("disabled", true);
     }
     if (brxz == "1") {
         ybnhlx = "yb";
@@ -97,13 +108,14 @@
     $(function () {
         GetPatDiagnosis();
     });
+    //西医诊断
     $("#txt_cyzd").newtouchBatchFloatingSelector({
         height: 200,
         width: 600,
         clickautotrigger: true,
         url: "/NurseManage/WardMaintenance/GetryzdSelect",
         ajaxparameters: function () {
-            return "ryzd=" + $("#txt_cyzd").val() + "&ybnhlx=" + ybnhlx;
+            return "ryzd=" + $("#txt_cyzd").val() + "&ybnhlx=" + ybnhlx + "&zdlb=" + "WM";
         },
         caption: "出院诊断",
         colModel: [
@@ -115,58 +127,17 @@
         ],
         itemdbclickhandler: function ($this) {
             $("#txt_cyzd").val($this.attr('data-zdmc'));
-            $("#txt_cyzddm").val($this.attr('data-zdbh'));
-        }
-    });
-    $("#txt_fzzd1").newtouchBatchFloatingSelector({
-        height: 200,
-        width: 600,
-        clickautotrigger: true,
-        url: "/NurseManage/WardMaintenance/GetryzdSelect",
-        ajaxparameters: function () {
-            return "ryzd=" + $("#txt_fzzd1").val() + "&ybnhlx=" + ybnhlx;
-        },
-        caption: "出院诊断",
-        colModel: [
-            { label: '名称', name: 'zdmc', widthratio: 60 },
-            { label: '拼音', name: 'py', widthratio: 20 },
-            { label: 'icd10', name: 'icd10', widthratio: 20 },
-            { label: '编号', name: 'zdbh', hidden: true },
-            { label: '内码', name: 'zdnm', hidden: true }
-        ],
-        itemdbclickhandler: function ($this) {
-            $("#txt_fzzd1").val($this.attr('data-zdmc'));
-            $("#txt_fzzd1dm").val($this.attr('data-zdbh'));
-        }
-    });
-    $("#txt_fzzd2").newtouchBatchFloatingSelector({
-        height: 200,
-        width: 600,
-        clickautotrigger: true,
-        url: "/NurseManage/WardMaintenance/GetryzdSelect",
-        ajaxparameters: function () {
-            return "ryzd=" + $("#txt_fzzd2").val() + "&ybnhlx=" + ybnhlx;
-        },
-        caption: "出院诊断",
-        colModel: [
-            { label: '名称', name: 'zdmc', widthratio: 60 },
-            { label: '拼音', name: 'py', widthratio: 20 },
-            { label: 'icd10', name: 'icd10', widthratio: 20 },
-            { label: '编号', name: 'zdbh', hidden: true },
-            { label: '内码', name: 'zdnm', hidden: true }
-        ],
-        itemdbclickhandler: function ($this) {
-            $("#txt_fzzd2").val($this.attr('data-zdmc'));
-            $("#txt_fzzd2dm").val($this.attr('data-zdbh'));
+            $("#txt_cyzddm").val($this.attr('data-icd10'));
         }
     });
-    $("#txt_fzzd3").newtouchBatchFloatingSelector({
+    //中医诊断
+    $("#txt_zycyzd").newtouchBatchFloatingSelector({
         height: 200,
         width: 600,
         clickautotrigger: true,
         url: "/NurseManage/WardMaintenance/GetryzdSelect",
         ajaxparameters: function () {
-            return "ryzd=" + $("#txt_fzzd3").val() + "&ybnhlx=" + ybnhlx;
+            return "ryzd=" + $("#txt_zycyzd").val() + "&ybnhlx=" + ybnhlx + "&zdlb=" + "TCM";
         },
         caption: "出院诊断",
         colModel: [
@@ -177,8 +148,8 @@
             { label: '内码', name: 'zdnm', hidden: true }
         ],
         itemdbclickhandler: function ($this) {
-            $("#txt_fzzd3").val($this.attr('data-zdmc'));
-            $("#txt_fzzd3dm").val($this.attr('data-zdbh'));
+            $("#txt_zycyzd").val($this.attr('data-zdmc'));
+            $("#txt_zycyzddm").val($this.attr('data-icd10'));
         }
     });
     function GetPatDiagnosis() {
@@ -191,38 +162,36 @@
             success: function(zdlist) {
                 $.each(zdlist,
                     function (n, item) {
-                        if (item.zdlx == "0") {
-                            $("#txt_cyzd").val(item.zdmc);
-                            $("#txt_cyzddm").val(item.zddm);
-                            $("#txt_cyqk").val(item.cyqk).trigger("change");
+                        if (item.zddl == "TCM") {//中医诊断
+                            if (item.zdlx == "1") {
+                                $("#txt_zycyzd").val(item.zdmc);
+                                $("#txt_zycyzddm").val(item.zddm);
+                                $("#txt_zycyqk").val(item.cyqk).trigger("change");
+                            }
+                            //辅助诊断
+                            if (item.zdlx > "1") {
+                                $('#tablezyzd .plusToggleCircle').click();
+                                var number = item.px;
+                                $("#txt_zyfzzd" + number).val(item.zdmc);
+                                $("#txt_zyfzzd" + number + "dm").val(item.zddm);
+                                $("#txt_zycyqk" + number).val(item.cyqk).trigger("change");
+                            }
+                        } else {
+                            if (item.zdlx == "1") {
+                                $("#txt_cyzd").val(item.zdmc);
+                                $("#txt_cyzddm").val(item.zddm);
+                                $("#txt_cyqk").val(item.cyqk).trigger("change");
+                            }
+                            //辅助诊断
+                            if (item.zdlx > "1") {
+                                $('#tablezd .plusToggleCircle').click();
+                                var number = item.px;
+                                $("#txt_fzzd" + number).val(item.zdmc);
+                                $("#txt_fzzd" + number + "dm").val(item.zddm);
+                                $("#txt_cyqk" + number).val(item.cyqk).trigger("change");
+                            }
                         }
-                        //if (item.zdlx == "1") {
-                        //    $("#txt_fzzd1").val(item.zdmc);
-                        //    $("#txt_fzzd1dm").val(item.zddm);
-                        //    $("#txt_cyqk1").val(item.cyqk).trigger("change");
-                        //}
-                        //if (item.zdlx == "2") {
-                        //    $("#txt_fzzd2").val(item.zdmc);
-                        //    $("#txt_fzzd2dm").val(item.zddm);
-                        //    $("#txt_cyqk2").val(item.cyqk).trigger("change");
-                        //}
-                        //if (item.zdlx == "3") {
-                        //    $("#txt_fzzd3").val(item.zdmc);
-                        //    $("#txt_fzzd3dm").val(item.zddm);
-                        //    $("#txt_cyqk3").val(item.cyqk).trigger("change");
-                        //}
-                        //if (item.zdlx == "1") {
-                        //    $("#txt_zdyzd").val(item.zdmc);
-                        //    $("#txt_cyqkzdy").val(item.cyqk).trigger("change");
-						//}
-						//辅助诊断
-						if (item.zdlx >= "1") {
-							$('#tablezd .plusToggleCircle').click();
-							var number = item.zdlx;
-							$("#txt_fzzd" + number).val(item.zdmc);
-							$("#txt_fzzd" +number+"dm").val(item.zddm);
-							$("#txt_cyqk" + number).val(item.cyqk).trigger("change");
-						}
+                      
                     });
             }
         });
@@ -291,26 +260,40 @@
 	}
 
 	function SavaOutArea() {
-
+	    debugger;
 		var PatDxList = [];
 
 		//出院诊断
 		var PatDxObj = {
-				zyh:'@ViewBag.zyh',
-				zdrq : $("#txt_zdsj").val(),
-				zdlb:2,
-				zdlx:0,
-				zddm: $("#txt_cyzddm").val(),
-				zdmc: $("#txt_cyzd").val(),
-				cyqk: $("#txt_cyqk").val()
+			zyh:'@ViewBag.zyh',
+			zdrq : $("#txt_zdsj").val(),
+			zddl: 'WM',
+			zdlb:2,
+			zdlx: 1,
+            px:1,
+			zddm: $("#txt_cyzddm").val(),
+			zdmc: $("#txt_cyzd").val(),
+			cyqk: $("#txt_cyqk").val()
 		}
-
-		if (PatDxObj.zddm == "" || PatDxObj.zdmc == "") {
+	    var PatDxZyObj = {
+	        zyh: '@ViewBag.zyh',
+	        zdrq: $("#txt_zyzdsj").val(),
+	        zddl: 'TCM',
+	        zdlb: 2,
+	        zdlx: 1,
+            px:1,
+	        zddm: $("#txt_zycyzddm").val(),
+	        zdmc: $("#txt_zycyzd").val(),
+	        cyqk: $("#txt_zycyqk").val()
+	    }
+	    if ((PatDxObj.zddm == "" || PatDxObj.zdmc == "") && (PatDxZyObj.zddm == "" || PatDxZyObj.zdmc == "")) {
 			$.modalAlert('该患者没有出院诊断，不允许出区！', 'warning');
 			return;
-		}
-		PatDxList.push(PatDxObj);
-
+	    }
+	    if (PatDxObj.zddm != "")
+	        PatDxList.push(PatDxObj);
+	    if (PatDxZyObj.zddm)
+	        PatDxList.push(PatDxZyObj);
 		//自定义诊断
 		 @*PatDxObj = {
 				zyh:'@ViewBag.zyh',
@@ -323,20 +306,39 @@
 			}
 		PatDxList.push(PatDxObj);*@
 
-		//辅助诊断
+		//西医辅助诊断
 		var number = $('#tablezd .zdinput').length;
-        for (var i = 1; i <= number-1; i++) {
+        for (var i = 2; i <= number; i++) {
 			 PatDxObj = {
 				zyh:'@ViewBag.zyh',
-				zdrq : $("#txt_zdsj").val(),
-				zdlb:2,
-				zdlx: i,
+			    zdrq: $("#txt_zdsj").val(),
+                zddl:'WM',
+                zdlb: 2,
+                zdlx:2,
+				px: i,
 				zddm:$("#txt_fzzd"+i+"dm").val(),
 				zdmc:$("#txt_fzzd" + i).val(),
 				cyqk:$("#txt_cyqk" + i).val()
 			}
 			PatDxList.push(PatDxObj);
         }
+	    //中医辅助诊断
+	    var number = $('#tablezyzd .zdinput').length;
+	    for (var i = 2; i <= number; i++) {
+	        PatDxObj = {
+	            zyh: '@ViewBag.zyh',
+	            zdrq: $("#txt_zyzdsj").val(),
+	            zddl: 'TCM',
+	            zdlb: 2,
+	            zdlx: 2,
+	            px: i,
+	            zddm: $("#txt_zyfzzd" + i + "dm").val(),
+	            zdmc: $("#txt_zyfzzd" + i).val(),
+	            cyqk: $("#txt_zycyqk" + i).val()
+	        }
+	        PatDxList.push(PatDxObj);
+	    }
+
 		$.ajax({
 			type: "POST",
 			url: "/NurseManage/WardMaintenance/SavaPatDxList",
@@ -355,14 +357,52 @@
 		});
 
 	}
+    //中医辅助诊断 新增icon
+    $('#tablezyzd .plusToggleCircle').click(function () {
+        var number = $('#tablezyzd .zdinput').length + 1;
+        if (isopendiag == "OFF") {
+            var $newTr = $('<tr><th class="formTitle"><i class="fa fa-minus minusToggleCircle" aria-hidden="true" style="width:30px;display:none; margin-left: 10px; color: #6ff3ad; font-size: large;"></i>主证：</th><td class="formValue" colspan="2"><input id="txt_zyfzzd' + number + 'dm" type="hidden" /><input id="txt_zyfzzd' + number + '" name="txt_zyfzzd' + number + '" type="text"  disabled="disabled" class="form-control required zdinput" /></td><th class="formTitle">出院情况：</th><td class="formValue"><select id="txt_zycyqk' + number + '" name="txt_zycyqk' + number + '"  disabled="disabled" class="form-control"><option value="1">治愈</option><option value="2">好转</option ><option value="3">未愈</option><option value="4">死亡</option><option value="5">其他</option></select ></select></td></tr>');
+            $newTr.appendTo($(this).closest('table'));
+        }
+        else {
+            var $newTr = $('<tr><th class="formTitle"><i class="fa fa-minus minusToggleCircle" aria-hidden="true" style="width:30px;margin-left: 10px; color: #6ff3ad; font-size: large;"></i>主证：</th><td class="formValue" colspan="2"><input id="txt_zyfzzd' + number + 'dm" type="hidden" /><input id="txt_zyfzzd' + number + '" name="txt_zyfzzd' + number + '" type="text" class="form-control required zdinput" /></td><th class="formTitle">出院情况：</th><td class="formValue"><select id="txt_zycyqk' + number + '" name="txt_zycyqk' + number + '" class="form-control"><option value="1">治愈</option><option value="2">好转</option ><option value="3">未愈</option><option value="4">死亡</option><option value="5">其他</option></select ></select></td></tr>');
+            $newTr.appendTo($(this).closest('table'));
+        }
+        //中医辅助诊断浮层
+        bindZyFzzdFloatingSelector(number);
+    });
+    //中医症候浮层
+    function bindZyFzzdFloatingSelector(number) {
+        $("#txt_zyfzzd" + number).newtouchBatchFloatingSelector({
+            height: 200,
+            width: 600,
+            clickautotrigger: true,
+            url: "/NurseManage/WardMaintenance/GetryzdSelect",
+            ajaxparameters: function () {
+                return "ryzd=" + $("#txt_zyfzzd" + number).val() + "&ybnhlx=" + ybnhlx + "&zdlb=" + "ZYZH";
+            },
+            caption: "出院诊断",
+            colModel: [
+                { label: '名称', name: 'zdmc', widthratio: 60 },
+                { label: '拼音', name: 'py', widthratio: 20 },
+                { label: 'icd10', name: 'icd10', widthratio: 20 },
+                { label: '编号', name: 'zdbh', hidden: true },
+                { label: '内码', name: 'zdnm', hidden: true }
+            ],
+            itemdbclickhandler: function ($this) {
+                $("#txt_zyfzzd" + number).val($this.attr('data-zdmc'));
+                $("#txt_zyfzzd" + number + "dm").val($this.attr('data-icd10'));
+            }
+        });
+    }
 
-	//辅助诊断 新增icon
-	$('#tablezd .plusToggleCircle').click(function () {
+
+	//西医辅助诊断 新增icon
+    $('#tablezd .plusToggleCircle').click(function () {
 		//var number = $('#tablexyzd .zdText').length + 1;
 		//var $newTr = $('<tr><th class="formTitle">副7</th><td class="formValue"><input type="checkbox" id="chk' + number + '" class="chkValue" style="float:left;" /><label style="float:left;margin-top:3px;">疑似</label><input type="text" id="zd' + number + '" class="form-control activeValue focusInput zdText" style="width:70%;" /><i class="fa fa-times" aria-hidden="true" hidden></i></td><td><i class="fa fa-minus minusToggleCircle" aria-hidden="true" style="margin-left: 10px; color: #6ff3ad; font-size: large;"></i></td></tr>');
 		//var $newTr = $('<tr><th class="formTitle">副</th><td class="formValue"><input type="checkbox" id="chk' + number + '" class="chkValue" style="float:left;" /><label style="float:left;margin-top:3px;">疑似</label><input type="text" id="zd' + number + '" class="form-control activeValue focusInput zdText" style="width:70%;" /><i class="fa fa-times" aria-hidden="true" hidden></i></td><td><i class="fa fa-minus minusToggleCircle" aria-hidden="true" style="margin-left: 10px; color: #6ff3ad; font-size: large;"></i></td><th class="formTitle">常用诊断</th><td class="formValue"><input type="text"  id="xycyzdoption' + number + '" name="xycyzdoption' + number + '" class="form-control activeValue focusInput xycyzdoptionText" /></td></tr>');
-
-	    var number = $('#tablezd .zdinput').length;// + 1;
+	    var number = $('#tablezd .zdinput').length+ 1;
 
 	    //var $newTr = $('<tr><th class="formTitle"><i class="fa fa-minus minusToggleCircle" aria-hidden="true" style="width:30px;margin-left: 10px; color: #6ff3ad; font-size: large;"></i>辅助诊断' + number + '：</th><td class="formValue" colspan="2"><input id="txt_fzzd' + number + 'dm" type="hidden" /><input id="txt_fzzd' + number + '" name="txt_fzzd' + number + '" type="text" class="form-control required zdinput" /></td><th class="formTitle">出院情况' + number + '：</th><td class="formValue"><select id="txt_cyqk' + number + '" name="txt_cyqk' + number + '" class="form-control" data-EnumType="EnumCYQK"></select></td></tr>');
 		if (isopendiag == "OFF") {
@@ -384,7 +424,7 @@
 		$(this).closest('tr').remove();
 	})
 
-	//辅助诊断浮层
+	//西医辅助诊断浮层
 	function bindFzzdFloatingSelector(number) {
         $("#txt_fzzd" + number).newtouchBatchFloatingSelector({
             height: 200,
@@ -392,7 +432,7 @@
             clickautotrigger: true,
             url: "/NurseManage/WardMaintenance/GetryzdSelect",
             ajaxparameters: function () {
-                return "ryzd=" + $("#txt_fzzd" + number).val() + "&ybnhlx=" + ybnhlx;
+                return "ryzd=" + $("#txt_fzzd" + number).val() + "&ybnhlx=" + ybnhlx + "&zdlb=" + "WM";
             },
             caption: "出院诊断",
             colModel: [
@@ -404,7 +444,7 @@
             ],
 			itemdbclickhandler: function ($this) {
 				$("#txt_fzzd" + number).val($this.attr('data-zdmc'));
-                $("#txt_fzzd" + number + "dm").val($this.attr('data-zdbh'));
+				$("#txt_fzzd" + number + "dm").val($this.attr('data-icd10'));
 			}
 		});
 	}
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaForm.cshtml b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaForm.cshtml
index 0a4dcf0facb44ede84ebbd44856eaf69401ca986..11236ea71d69ba90bf5136a7b6e8deb904a271ab 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaForm.cshtml
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/NurseManage/Views/WardMaintenance/OutAreaForm.cshtml
@@ -45,45 +45,84 @@
                            onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function () { RefreshOrder() } })" value="@DateTime.Now.ToString("yyyy-MM-dd ")" />
                 </td>
             </tr>
-            <tr>
-                <th class="formTitle">出院诊断：</th>
-                <td class="formValue">
-                    <input id="txt_cyzddm" type="hidden" />
-                    <input id="txt_cyzd" disabled="disabled" name="txt_cyzd" type="text" style="background-color:#edeaea" class="form-control required zdinput" />
-                </td>
-            </tr>
-            <tr>
-                <th class="formTitle">辅助诊断1：</th>
-                <td class="formValue">
-                    <input id="txt_fzzd1dm" type="hidden" />
-                    <input id="txt_fzzd1" disabled="disabled" name="txt_fzzd1" type="text" style="background-color:#edeaea" class="form-control required zdinput" />
-                </td>
-            </tr>
-            <tr>
-                <th class="formTitle">辅助诊断2：</th>
-                <td class="formValue">
-                    <input id="txt_fzzd2dm" type="hidden" />
-                    <input id="txt_fzzd2" disabled="disabled" name="txt_fzzd2" type="text" style="background-color:#edeaea" class="form-control required zdinput" />
-                </td>
-            </tr>
-            <tr>
-                <th class="formTitle">辅助诊断3：</th>
-                <td class="formValue">
-                    <input id="txt_fzzd3dm" type="hidden" />
-                    <input id="txt_fzzd3" disabled="disabled" name="txt_fzzd3" type="text" style="background-color:#edeaea" class="form-control required zdinput" />
-                </td>
-            </tr>
-            <tr>
-                <th class="formTitle">自定义诊断：</th>
-                <td class="formValue">
-                    <textarea id="txt_zdyzd" disabled="disabled" name="txt_zdyzd" style="background-color:#edeaea" class="form-control zdinput" style="height: 60px;"></textarea>
-                </td>
-            </tr>
+            @*<tr>
+                    <th class="formTitle">出院诊断：</th>
+                    <td class="formValue">
+                        <input id="txt_cyzddm" type="hidden" />
+                        <input id="txt_cyzd" disabled="disabled" name="txt_cyzd" type="text" style="background-color:#edeaea" class="form-control required zdinput" />
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle">辅助诊断1：</th>
+                    <td class="formValue">
+                        <input id="txt_fzzd1dm" type="hidden" />
+                        <input id="txt_fzzd1" disabled="disabled" name="txt_fzzd1" type="text" style="background-color:#edeaea" class="form-control required zdinput" />
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle">辅助诊断2：</th>
+                    <td class="formValue">
+                        <input id="txt_fzzd2dm" type="hidden" />
+                        <input id="txt_fzzd2" disabled="disabled" name="txt_fzzd2" type="text" style="background-color:#edeaea" class="form-control required zdinput" />
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle">辅助诊断3：</th>
+                    <td class="formValue">
+                        <input id="txt_fzzd3dm" type="hidden" />
+                        <input id="txt_fzzd3" disabled="disabled" name="txt_fzzd3" type="text" style="background-color:#edeaea" class="form-control required zdinput" />
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle">自定义诊断：</th>
+                    <td class="formValue">
+                        <textarea id="txt_zdyzd" disabled="disabled" name="txt_zdyzd" style="background-color:#edeaea" class="form-control zdinput" style="height: 60px;"></textarea>
+                    </td>
+                </tr>*@
         </table>
     </div>
+    <div class="container">
+        <ul class="nav nav-tabs" role="tablist" id="myTab">
+            <li role="presentation"><a href="#xyzdInfo" role="tab" data-toggle="tab">西医诊断</a></li>
+            <li role="presentation"><a href="#zyzdInfo" role="tab" data-toggle="tab">中医诊断</a></li>
+        </ul>
+    </div>
+    <div class="tab-content">
+        <div role="tabpanel" class="tab-pane fade in active" id="xyzdInfo">
+            <table id="tablezd" class="form">
+                <tr>
+                    <th class="formTitle">
+                        <i id="zdCircle" class="fa fa-plus-circle plusToggleCircle" aria-hidden="true" style="display:none;color: #6ff3ad; font-size: large;"></i>
+                        出院诊断：
+                    </th>
+                    <td class="formValue">
+                        <input id="txt_cyzddm" type="hidden" />
+                        <input id="txt_cyzd" name="txt_cyzd" type="text" style="background-color:#edeaea" disabled="disabled" class="form-control required zdinput" />
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div id="zyzdInfo" role="tabpanel" class="tab-pane fade in">
+            <table id="tablezyzd" class="form" style="width: 98%; border: 0">
+                <tr>
+
+                    <th class="formTitle">
+                        <i id="zyzdCircle" class="fa fa-plus-circle plusToggleCircle" aria-hidden="true" style="display:none;color: #6ff3ad; font-size: large;"></i>
+                        主病：
+                    </th>
+                    <td class="formValue">
+                        <input id="txt_zycyzddm" type="hidden" />
+                        <input id="txt_zycyzd" name="txt_zycyzd" type="text" style="background-color:#edeaea" disabled="disabled" class="form-control required zdinput" />
+                    </td>
+                </tr>
+
+            </table>
+        </div>
+    </div>
 </form>
 <script lang="javascript">
     var zdcnt = 0;
+    $('#myTab a:first').tab('show');
     $(function () {
         GetPatDiagnosis();
 
@@ -145,29 +184,58 @@
             success: function (zdlist) {
                 //zdcnt = zdlist.length;
                 $.each(zdlist, function (n, item) {
-                    if (item.zddm != "999999999")
+                    if (item.zddm)
                     {
                         zdcnt++;
                     }
-                    if (item.zdlx=="0") {
-                        $("#txt_cyzd").val(item.zdmc);
-                        $("#txt_cyzddm").val(item.zddm);
-                    }
-                    if (item.zdlx == "1") {
-                        $("#txt_fzzd1").val(item.zdmc);
-                        $("#txt_fzzd1dm").val(item.zddm);
-                    }
-                    if (item.zdlx == "2") {
-                        $("#txt_fzzd2").val(item.zdmc);
-                        $("#txt_fzzd2dm").val(item.zddm);
-                    }
-                    if (item.zdlx == "3") {
-                        $("#txt_fzzd3").val(item.zdmc);
-                        $("#txt_fzzd3dm").val(item.zddm);
-                    }
-                    if (item.zdlx == "9") {
-                        $("#txt_zdyzd").val(item.zdmc);
+                    if (item.zddl == "TCM") {
+                        if (item.zdlx == "1") {
+                            $("#txt_zycyzd").val(item.zdmc);
+                            $("#txt_zycyzddm").val(item.zddm);
+                        }
+                        //辅助诊断
+                        if (item.zdlx > "1") {
+                            $('#tablezyzd .plusToggleCircle').click();
+                            var number = item.px;
+                            $("#txt_zyfzzd" + number).val(item.zdmc);
+                            $("#txt_zyfzzd" + number + "dm").val(item.zddm);
+                        }
+                    } else {
+                        if (item.zdlx == "1") {
+                            $("#txt_cyzd").val(item.zdmc);
+                            $("#txt_cyzddm").val(item.zddm);
+                        }
+                        //辅助诊断
+                        if (item.zdlx > "1") {
+                            $('#tablezd .plusToggleCircle').click();
+                            var number = item.px;
+                            $("#txt_fzzd" + number).val(item.zdmc);
+                            $("#txt_fzzd" + number + "dm").val(item.zddm);
+                        }
                     }
+                    //if (item.zddm != "999999999")
+                    //{
+                    //    zdcnt++;
+                    //}
+                    //if (item.zdlx=="0") {
+                    //    $("#txt_cyzd").val(item.zdmc);
+                    //    $("#txt_cyzddm").val(item.zddm);
+                    //}
+                    //if (item.zdlx == "1") {
+                    //    $("#txt_fzzd1").val(item.zdmc);
+                    //    $("#txt_fzzd1dm").val(item.zddm);
+                    //}
+                    //if (item.zdlx == "2") {
+                    //    $("#txt_fzzd2").val(item.zdmc);
+                    //    $("#txt_fzzd2dm").val(item.zddm);
+                    //}
+                    //if (item.zdlx == "3") {
+                    //    $("#txt_fzzd3").val(item.zdmc);
+                    //    $("#txt_fzzd3dm").val(item.zddm);
+                    //}
+                    //if (item.zdlx == "9") {
+                    //    $("#txt_zdyzd").val(item.zdmc);
+                    //}
                 })
             }
         })
@@ -179,8 +247,10 @@
         var cyfs = $("#sel_cqfs").val();
         var cqsj = $("#txt_cqrq").val();
         //var zdrq = $("#txt_zdsj").val();
-        var zyzd = $("#txt_cyzd").val();
+        var zyzd = $("#txt_cyzd").val();//西医诊断
         var zyzddm = $("#txt_cyzddm").val();
+        var zyzyzd = $("#txt_zycyzd").val();//中医诊断
+        var zyzyzddm = $("#txt_zycyzddm").val();
         //var fzzd1 = $("#txt_fzzd1").val();
         //var fzzd1dm = $("#txt_fzzd1dm").val();
         //var fzzd2 = $("#txt_fzzd2").val();
@@ -192,15 +262,15 @@
             zyh: zyh,
             cyfs: cyfs,
             cqsj: cqsj,
-            zyzddm: zyzddm,
-            zyzd: zyzd
+            zyzddm: (zyzddm == null || zyzddm == undefined) ? zyzyzddm : zyzddm,
+            zyzd: (zyzd == null || zyzd == undefined) ? zyzyzd : zyzd
         }
-        if (zyzd == "" || zyzddm == "") {
+        if ((zyzd == "" || zyzddm == "") && (zyzyzd == "" || zyzyzddm=="")) {
             if ('@isOpendiags' == 'OFF') {
-                $.modalAlert('该患者病案首页出院诊断未录入，不允许出区！', 'warning');
+                $.modalAlert('该患者病案首页出院主诊断未录入，不允许出区！', 'warning');
             }
             else {
-                $.modalAlert('该患者没有出院诊断，不允许出区！', 'warning');
+                $.modalAlert('该患者没有出院主诊断，不允许出区！', 'warning');
             }
             callBack();
         }
@@ -298,6 +368,20 @@
 
 
     }
+    //中医辅助诊断 新增icon
+    $('#tablezyzd .plusToggleCircle').click(function () {
+        var number = $('#tablezyzd .zdinput').length + 1;
+        var $newTr = $('<tr><th class="formTitle"><i class="fa fa-minus minusToggleCircle" aria-hidden="true" style="width:30px;display:none; margin-left: 10px; color: #6ff3ad; font-size: large;"></i>主证：</th><td class="formValue"><input id="txt_zyfzzd' + number + 'dm" type="hidden" /><input id="txt_zyfzzd' + number + '" name="txt_zyfzzd' + number + '" type="text"  disabled="disabled" style="background-color:#edeaea" class="form-control required zdinput" /></td></tr>');
+        $newTr.appendTo($(this).closest('table'));
+    });
+
+    //西医辅助诊断 新增icon
+    $('#tablezd .plusToggleCircle').click(function () {
+        var number = $('#tablezd .zdinput').length + 1;
+        var $newTr = $('<tr><th class="formTitle"><i class="fa fa-minus minusToggleCircle" aria-hidden="true" style="width:30px;display:none; margin-left: 10px; color: #6ff3ad; font-size: large;"></i>辅助诊断：</th><td class="formValue"><input id="txt_fzzd' + number + 'dm" type="hidden" /><input id="txt_fzzd' + number + '" name="txt_fzzd' + number + '" type="text"  disabled="disabled" style="background-color:#edeaea" class="form-control required zdinput" /></td></tr>');
+        $newTr.appendTo($(this).closest('table'));
+    });
+
     function clearData()
     {
         $("#sel_cqfs").val("");
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Configs/9_183/database.config b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Configs/9_183/database.config
new file mode 100644
index 0000000000000000000000000000000000000000..93ab4aaa24de61b0f14f0041d4101f7fc94e5533
--- /dev/null
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Configs/9_183/database.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<connectionStrings>
+
+	<!-- 眼科测试 -->
+	<add name="DefaultDbContext" connectionString="Server=192.168.9.183,1433;Initial Catalog=Newtouch_CIS;User ID=sa;Password=a1+b2*c3=d4" providerName="System.Data.SqlClient" />
+	<add name="DbHelperSQL.DefaultConn" connectionString="Server=192.168.9.183;Initial Catalog=Newtouch_CIS;User ID=sa;Password=a1+b2*c3=d4" providerName="System.Data.SqlClient" />
+
+	<!-- Redis -->
+	<add name="RedisServer" connectionString="127.0.0.1:6379,connectTimeout=500,password=newtouch" />
+
+</connectionStrings>
+
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Configs/9_183/system.config b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Configs/9_183/system.config
new file mode 100644
index 0000000000000000000000000000000000000000..e59c25e8861c5060ec26a88227e864d819cabe66
--- /dev/null
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Configs/9_183/system.config
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appSettings>
+	<!-- ================== 1：开发系统相关配置 ================== -->
+	<!-- 登录身份状态维持时间（单位：分）-->
+	<add key="LoginStatusKeepMinute" value="3000" />
+	<!-- 多终端互踢 -->
+	<add key="EnableMultipleLoginLimit" value="false" />
+	<!-- 多终端互踢-同一账号，最大同时在线数 -->
+	<add key="MultipleLoginLimit_Count" value="10" />
+
+	<!--启用IP过滤（启用后 启用IP访问限制策略（仅对部分开放 或 部分限制访问）） -->
+	<add key="Is_IPFilter" value="false" />
+
+	<!-- ================== 2：系统软件参数配置 ================== -->
+	<!-- 软件版本 -->
+	<add key="Version" value="1.00.00.00" />
+
+	<!-- 关键部分Module Id配置 -->
+	<!-- Reids缓存的key前缀 -->
+	<add key="Reids_Cache_Prefix" value="$C_CIS$"/>
+	<!-- 顶级组织机构Id -->
+	<add key="Top_OrganizeId" value="6d5752a7-234a-403e-aa1c-df8b45d3469f"/>
+	<!--<add key="Top_OrganizeId" value="49bc45ea-5ebf-4111-a9cf-2d455c190460"/>-->
+	<!-- 应用Id -->
+	<add key="AppId" value="CIS"/>
+	<add key="AppName" value="新致医疗云医护协同工作站"/>
+
+	<!-- 静态站点的Host -->
+	<add key="SiteStaticHost" value="http://61.172.179.73:41142/"/>
+	<!-- 日志服务的Url -->
+	<add key="His.Log.URL" value="http://59.80.30.157:20106/"/>
+
+	<!-- 登录时是否显示验证码 -->
+	<add key="Is_CheckChkCode" value="true"/>
+	<!-- 本地文件默认路径 -->
+	<add key="LocalFileBaseDir" value="C:\\"/>
+
+	<!-- 老报表服务,废弃字段 -->
+	<add key="ReportServer.HOST" value="http://61.172.179.73:8009/"/>
+
+	<!-- 单点登录首页url 废弃字段 -->
+	<add key="SSOHomeHost" value="http://61.172.179.73:41137/Home/Index"/>
+	<!-- 单点登出url 废弃字段 -->
+	<add key="SSOOutLogin" value="http://61.172.179.73:41137/Login/OutLogin"/>
+
+
+	<!-- SettAPI接口地址 http://localhost:17361/ -->
+	<add key="SiteSettAPIHost" value="http://192.168.9.183:7002/"/>
+
+	<add key="SiteBaseAPIHost" value="http://192.168.9.183:7001/"/>
+
+	<add key="SiteYfykAPIHost" value="http://192.168.9.183:7004/"/>
+
+	<add key="SiteORAPIHost" value="http://192.168.9.183:7006/"/>
+	<!-- 可能废弃 -->
+	<add key="SiteHerpAPIHost" value="http://localhost:6065/"/>
+
+	<!-- 页面domain（嵌套其他域页面，并执行js 要设置成同一域）-->
+	<add key="Document_Domain" value="61.172.179.73"/>
+	<!-- API地址-统一授权用户身份换取 -->
+	<add key="UAUserInfoGetAPI" value="http://192.168.9.183:7002/api/UA/GetUserInfo"/>
+	<!-- Sett地址配置（统一授权登录配置）（Sett.Web外网地址） -->
+	<add key="Sett_UALoginAddress" value="http://61.172.179.73:41134/Login/UALogin"/>
+	<!-- EMR地址配置（统一授权登录配置）（EMR.Web外网地址） -->
+
+	<!-- 门诊开立处方，待就诊患者查询API预热链接（结算系统API内网地址） -->
+	<add key="UAOutPatientRegistrationQueryPreAPI" value="http://192.168.9.183:7002/api/UA/OutPatientRegistrationQueryPre"/>
+
+	<!-- ================== 3：住院电子病历配置 ================== -->
+	<!-- EMR地址配置（统一授权登录配置）（EMR.Web外网地址） -->
+	<add key="EMR_UALoginAddress" value="http://61.172.179.73:41137/Login/UALogin"/>
+	<add key="newtouch.his.pds1_UALoginAddress" value="http://61.172.179.73:41136/Login/UALogin"/>
+
+
+	<add key="vs:EnableBrowserLink" value="false"/>
+	<!--ESB调用-->
+	<add key="yysz_esbBM" value="EBD61E2D-1AE6-4162-92B4-FBC3D63C10CE"/>
+
+	<!--高峰ESB调用-->
+	<add key="yysz_hyfqURL" value="http://10.207.33.20:8080/Login.aspx"/>
+
+	<!--卫计委规定的各个医院的机构编码-->
+	<!--<add key="OrganizeCodeSd" value="43010112005"/>-->
+	<!--远程医疗会诊报告URL-->
+	<add key="RemoteTreatRPTURL" value="http://10.207.33.22:8080/TMS/consReport/viewReportInfo.html"/>
+
+	<!--中医远程医疗平台  start-->
+
+	<add key="IntegratedModuleUrl" value="http://cas.sinosoft.com.cn:7002/tcmpms/getPageUrl/http?resource=" />
+	<!--中医远程医疗平台  end-->
+	<!--是否连接手术系统-->
+	<add key="EnableLinkToOR" value="true"/>
+	<!--医保审核接口 医保中心端给医院分配的医院编码和名称-->
+	<add key="OrganizeCodeSd" value="43010112005"/>
+	<add key="HospitalName" value="测试医院"/>
+	<!--报表服务器ip-->
+	<add key="ReportUrl" value="http://61.172.179.73:41143/"/>
+	<add key="ReportSystemCode" value="CIS"/>
+
+	<!-- 接口中心地址 -->
+	<add key="Token_ApiManage" value="API.Manage"/>
+	<add key="SiteTokenAPIHost" value="http://192.168.9.183:8015/"/>
+	<add key="SiteConmonAPIHost" value="http://192.168.9.183:8016/"/>
+	<add key="OuterMediaMeettingAPIHost" value="https://61.172.179.30:17015/"/>
+	<add key="SiteNoticeCenterHost" value="http://61.172.179.73:41133/"/>
+	<!-- 外部PACS接口 -->
+	<add key="OuterPacsServiceHost" value="http://36.137.36.185:7102"/>
+
+	<!-- 登录页显示文字机构编码 -->
+	<add key="loginybshowcode" value="机构编码：H10000000"/>
+	<!-- 登录页显示文字机构名称 -->
+	<add key="loginybshowname" value="机构名称：开源医疗"/>
+</appSettings>
\ No newline at end of file
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Content/js/floatingselector.js b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Content/js/floatingselector.js
index ecc612905f8c9c3082b49439ba5b9c5ee9208d59..c86ee4a853db38320b7aeb982988ceea35bdbd27 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Content/js/floatingselector.js
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Content/js/floatingselector.js
@@ -510,7 +510,6 @@ $.fn.multiquencyNewtouchFloatingSelector = function (options, data) {
 
         //单击其他 隐藏浮层
         $(document).click(function (e) {
-            debugger;
             e = e || window.event;
             $target = $(e.target);
             var elem = e.target || e.srcElement;
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Controllers/MedicalRecordController.cs b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Controllers/MedicalRecordController.cs
index c695c039ffd758a20750bce991c10f6a2389bba1..8341bcd2e3b9469183b486947d018ad9b744b1e3 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Controllers/MedicalRecordController.cs
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Controllers/MedicalRecordController.cs
@@ -503,8 +503,10 @@ namespace Newtouch.CIS.Web.Controllers
                 };
                 var apiResp = SiteSettAPIHelper.Request<APIRequestHelper.DefaultResponse<SignInStateRequest>>(
                      "api/SignInAppointment/SignInState", reqObj);
-                if (apiResp.msg != null){
-                    return Success("接口调用失败【" + apiResp.msg + apiResp.sub_msg + "】");
+                if (apiResp.msg != null || apiResp.sub_msg != null)
+                {
+                    LogCore.Error("签到状态修改接口调用失败【" + apiResp.msg + apiResp.sub_msg + "】");
+                    throw new FailedException("签到状态修改接口调用失败【" + apiResp.msg + apiResp.sub_msg + "】");
                 }
             }
 
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Newtouch.CIS.Web.csproj b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Newtouch.CIS.Web.csproj
index ba663278b16ac9476e6e45c7a99c5e83b9b141f9..8c7efef9df6b2710af20100515d6e300184521e0 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Newtouch.CIS.Web.csproj
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Newtouch.CIS.Web.csproj
@@ -380,6 +380,10 @@
       <SubType>Designer</SubType>
     </Content>
     <Content Include="Configs\9_190\database.config" />
+    <Content Include="Configs\9_183\database.config" />
+    <Content Include="Configs\9_183\system.config">
+      <SubType>Designer</SubType>
+    </Content>
     <None Include="Scripts\jquery-1.10.2.intellisense.js" />
     <Content Include="Scripts\jquery-1.10.2.js" />
     <Content Include="Scripts\jquery-1.10.2.min.js" />
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Properties/PublishProfiles/FolderProfile.pubxml b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Properties/PublishProfiles/FolderProfile.pubxml
index bef6f7212e2eab68014ab194e27bdc2f0b4729f7..4bbaa3895e6f1a69457512e28d42ecf6d3e5c560 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Properties/PublishProfiles/FolderProfile.pubxml
@@ -4,13 +4,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>..\..\publish\CIS</PublishUrl>
+    <PublishUrl>D:\Pulish\CIS</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Views/MedicalRecord/MedicalRecord.cshtml b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Views/MedicalRecord/MedicalRecord.cshtml
index d0aa23c7eb640582fbf15c896ad8e0bcd6405ab0..267d65aa4f3534d6446f91a0172c7b9c9a24affa 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Views/MedicalRecord/MedicalRecord.cshtml
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Views/MedicalRecord/MedicalRecord.cshtml
@@ -3494,7 +3494,13 @@
                         }
                         else {
                             let JeArray = {};
-                            itemsMxArr.forEach(items => { if (!JeArray[item.je]) JeArray[item.je] = []; JeArray[item.je].push(item); });
+                            itemsMxArr.forEach(item => {
+                                if (!JeArray[item.je]) {
+                                    JeArray[item.je] = [];
+                                }
+                                JeArray[item.je].push(item);
+                            });
+
                             var JeArrays = new Array();
 
                             for (const groupKey in JeArray) {
@@ -6026,7 +6032,7 @@
                 //if (q)
                 //    q.name = "";
                 //q = p;
-                zdids = q.id;
+                zdids = p.id;
             }
 
         }, true);
@@ -6044,7 +6050,7 @@
                 //if (q)
                 //    q.name = "";
                 //q = p;
-                zdids = q.id;
+                zdids = p.id;
             }
         }, true);
 
diff --git a/Newtouch.HIS.CIS/Newtouch.Domain/Entity/Inpatient/InpatientPatientDiagnosisEntity.cs b/Newtouch.HIS.CIS/Newtouch.Domain/Entity/Inpatient/InpatientPatientDiagnosisEntity.cs
index 1be53f77c4824691306f3c0e5317aab6f7c578f2..c4dd7a7302272cc38b6f672cedb512b5db39f6ec 100644
--- a/Newtouch.HIS.CIS/Newtouch.Domain/Entity/Inpatient/InpatientPatientDiagnosisEntity.cs
+++ b/Newtouch.HIS.CIS/Newtouch.Domain/Entity/Inpatient/InpatientPatientDiagnosisEntity.cs
@@ -30,6 +30,10 @@ namespace Newtouch.Domain.Entity
         /// <returns></returns>
         public string zyh { get; set; }
         /// <summary>
+        /// WM 西医  TCM 中医
+        /// </summary>
+        public string zddl { get; set; }
+        /// <summary>
         /// 1入院诊断2出院诊断
         /// </summary>
         /// <returns></returns>
@@ -79,7 +83,13 @@ namespace Newtouch.Domain.Entity
         /// </summary>
         /// <returns></returns>
         public string zt { get; set; }
-
+        /// <summary>
+        /// 出院情况
+        /// </summary>
         public int? cyqk { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int? px { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Newtouch.HIS.CIS/Newtouch.Domain/ValueObjects/Inpatient/WardMaintenanceVO.cs b/Newtouch.HIS.CIS/Newtouch.Domain/ValueObjects/Inpatient/WardMaintenanceVO.cs
index e54a9f0da993b577482db5125dfd91542ad53797..c5da7be487206322e54d02a224366b30df3b9a1b 100644
--- a/Newtouch.HIS.CIS/Newtouch.Domain/ValueObjects/Inpatient/WardMaintenanceVO.cs
+++ b/Newtouch.HIS.CIS/Newtouch.Domain/ValueObjects/Inpatient/WardMaintenanceVO.cs
@@ -59,12 +59,14 @@ namespace Newtouch.Domain.ValueObjects.Inpatient
     public class PatDiagnosisVO
     {
         public string Id { get; set; }
+        public string zddl { get; set; }
         public string zdlb { get; set; }
         public string zdlx { get; set; }
         public string zddm { get; set; }
         public string zdmc { get; set; }
         public string zdyzdmc { get; set; }
         public string cyqk { get; set; }
+        public int px { get; set; }
     }
 
     /// <summary>
diff --git a/Newtouch.HIS.CIS/Newtouch.DomainServices/Inpatient/EntryRegistrationDmnService.cs b/Newtouch.HIS.CIS/Newtouch.DomainServices/Inpatient/EntryRegistrationDmnService.cs
index ba77ef8f3cdacd048d57fc59a413cd0421e05d24..bdb7d27d4d19f82c437b15a2234f37af1c7d9587 100644
--- a/Newtouch.HIS.CIS/Newtouch.DomainServices/Inpatient/EntryRegistrationDmnService.cs
+++ b/Newtouch.HIS.CIS/Newtouch.DomainServices/Inpatient/EntryRegistrationDmnService.cs
@@ -418,9 +418,11 @@ FROM    dbo.zy_brxxk zyxx
             StringBuilder sqlStr = new StringBuilder();
             var parlist = new List<SqlParameter>();
             sqlStr.Append(@" SELECT 
-    zyxx.id , zyxx.zyh ,zyxx.xm ,zyxx.sex ,zyxx.brxzdm brxz,
-CAST(FLOOR(DATEDIFF(DY, zyxx.birth, GETDATE()) / 365.25) AS VARCHAR(5)) nl ,
-cw.cwmc ,zyxx.ryrq ,  zyxx.brxzmc, zyxx.zdmc zzdmc,cyzd.zdmc cyzdmc,  staff.Name ysxm,zyxx.cqrq,zyxx.CreateTime,zyxx.CreatorCode
+    zyxx.id , zyxx.zyh ,zyxx.xm ,zyxx.sex ,zyxx.brxzdm brxz
+,CAST(FLOOR(DATEDIFF(DY, zyxx.birth, GETDATE()) / 365.25) AS VARCHAR(5)) nl 
+,cw.cwmc ,zyxx.ryrq ,  zyxx.brxzmc, zyxx.zdmc zzdmc
+,(select top 1 zdmc from zy_PatDxInfo cyzd where cyzd.zdlb=2 and cyzd.zt=1  and (cyzd.zdlx='1' or cyzd.zdlx='0') and cyzd.zyh=zyxx.zyh) cyzdmc
+,staff.Name ysxm,zyxx.cqrq,zyxx.CreateTime,zyxx.CreatorCode
 FROM    dbo.zy_brxxk zyxx
         INNER JOIN NewtouchHIS_Base..V_S_xt_bq bq ON bq.bqCode = zyxx.WardCode
                                                      AND bq.OrganizeId = zyxx.OrganizeId
@@ -429,7 +431,7 @@ FROM    dbo.zy_brxxk zyxx
                                                     AND cw.OrganizeId = zyxx.OrganizeId
         LEFT JOIN NewtouchHIS_Base..V_S_Sys_Staff staff ON staff.gh = zyxx.ysgh
                                                    AND staff.OrganizeId = zyxx.OrganizeId
-        LEFT JOIN zy_PatDxInfo cyzd on cyzd.zyh=zyxx.zyh and cyzd.zdlb=2 and cyzd.zdlx=0 and cyzd.zt=1 
+        --LEFT JOIN zy_PatDxInfo cyzd on cyzd.zyh=zyxx.zyh and cyzd.zdlb=2 and cyzd.zdlx=0 and cyzd.zt=1 
         WHERE 1 = 1 and  zyxx.OrganizeId=@orgId ");
             parlist.Add(new SqlParameter("@orgId", orgId.ToString()));
             if (!string.IsNullOrWhiteSpace(keyword))
diff --git a/Newtouch.HIS.CIS/Newtouch.DomainServices/Inpatient/WardMaintenanceDmnService.cs b/Newtouch.HIS.CIS/Newtouch.DomainServices/Inpatient/WardMaintenanceDmnService.cs
index b4edd36c792a6d0f159adcd380c2752d1b08cae6..6cb4d7c1d1af3ef89f51cb9ac484aa193f336e26 100644
--- a/Newtouch.HIS.CIS/Newtouch.DomainServices/Inpatient/WardMaintenanceDmnService.cs
+++ b/Newtouch.HIS.CIS/Newtouch.DomainServices/Inpatient/WardMaintenanceDmnService.cs
@@ -246,12 +246,14 @@ where czjl.createtime=@bysj
 			var sqlstr = new StringBuilder();
 			var par = new List<SqlParameter>();
 			sqlstr = sqlstr.Append(@" SELECT  [Id]
+              ,isnull(zddl,'WM') zddl
               ,[zdlb]
-              ,[zdlx]
+              ,case when [zdlx]='0' then '1' else zdlx end zdlx
               ,[zddm]
               ,[zdmc]
               ,[zdyzdmc]
-              ,convert(varchar(2),cyqk)cyqk
+              ,convert(varchar(2),cyqk) cyqk
+              ,isnull(px,1) px
             FROM [Newtouch_CIS].[dbo].[zy_PatDxInfo]
             WHERE zt='1' and zdlb='2' ");
 			if (req != null)
@@ -265,8 +267,8 @@ where czjl.createtime=@bysj
 					sqlstr.Append("  AND zyh=@zyh ");
 				}
 			}
-			sqlstr.Append("  order by convert(int,zdlx)  ");
-			par.Add(new SqlParameter("@OrganizeId", req.OrganizeId));
+            sqlstr.Append("  order by zddl, convert(int,zdlx),px  ");
+            par.Add(new SqlParameter("@OrganizeId", req.OrganizeId));
 			par.Add(new SqlParameter("@zyh", req.zyh));
 			return this.FindList<PatDiagnosisVO>(sqlstr.ToString(), par.ToArray());
 		}
@@ -671,8 +673,10 @@ where czjl.createtime=@bysj
 						diaEntity.Id = Guid.NewGuid().ToString();
 						diaEntity.OrganizeId = OrganizeId;
 						diaEntity.zyh = PatDxEntity.zyh;
+                        diaEntity.zddl = PatDxEntity.zddl;
 						diaEntity.zdlb = PatDxEntity.zdlb;
 						diaEntity.zdlx = PatDxEntity.zdlx;
+                        diaEntity.px = PatDxEntity.px;
 						diaEntity.zddm = PatDxEntity.zddm;
 						diaEntity.zdmc = PatDxEntity.zdmc;
 						diaEntity.cyqk = Convert.ToInt32(PatDxEntity.cyqk);
diff --git a/Newtouch.HIS.CIS/Newtouch.DomainServices/Outpatient/MedicalRecordDmnService.cs b/Newtouch.HIS.CIS/Newtouch.DomainServices/Outpatient/MedicalRecordDmnService.cs
index b64dab7c6f7e834577912153c8ff980edaf15086..f3b5d629ee8f268a2bd55502319a75f92b81de65 100644
--- a/Newtouch.HIS.CIS/Newtouch.DomainServices/Outpatient/MedicalRecordDmnService.cs
+++ b/Newtouch.HIS.CIS/Newtouch.DomainServices/Outpatient/MedicalRecordDmnService.cs
@@ -1091,7 +1091,17 @@ where zyzd.zdlx = 1 and jzId = @jzId and zyzd.zt = '1'", new[] { new SqlParamete
                             };
 
                             var cfmxList = _prescriptionDetailRepo.IQueryable(p => p.cfId == cf.cfId && p.zt == "1").ToList();
-                            var list = cfmxList.Select(cfmx => new TreamentItemVO { sfxm = cfmx.xmCode, dczll = cfmx.mczll, zxcs = Convert.ToInt32(cfmx.sl), dw = cfmx.dw, zzfbz = cfmx.zzfbz, ztId = cfmx.ztId, ztmc = cfmx.ztmc, ztsl = cfmx.ztsl }).Where(p => p.sl > 0).ToList();
+                            var list = cfmxList.Select(cfmx => new TreamentItemVO { 
+                                sfxm = cfmx.xmCode,
+                                dczll = cfmx.mczll,
+                                zxcs = Convert.ToInt32(cfmx.sl),
+                                dw = cfmx.dw,
+                                zzfbz = cfmx.zzfbz,
+                                ztId = cfmx.ztId,
+                                ztmc = cfmx.ztmc,
+                                ztsl = cfmx.ztsl,
+                                sl = Convert.ToDecimal(cfmx.sl)
+                            }).Where(p => p.sl > 0).ToList();
                             dto.AddTreamentItems = list;
                             dtoList.Add(dto);
                             break;
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/DTO/InputDto/MRHomePage/BasyZdDto.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/DTO/InputDto/MRHomePage/BasyZdDto.cs
index eaf70e9f61ee883da81a038035756b85c81b9e62..b0bde58e9b9e7f5579c9b772c4ef3ad17b1c96b2 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/DTO/InputDto/MRHomePage/BasyZdDto.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/DTO/InputDto/MRHomePage/BasyZdDto.cs
@@ -65,5 +65,13 @@ namespace Newtouch.EMR.Domain.DTO.InputDto
         public string CYQKMS { get; set; }
 
         public string zt { get; set; }
+        /// <summary>
+        /// 1主要诊断 2其他诊断 3 中医主病 4 中医主证
+        /// </summary>
+        public string ZDLX { get; set; }
+        /// <summary>
+        /// WM:西医 TCM中医
+        /// </summary>
+        public string ZDLB { get; set; }
     }
 }
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/DTO/InputDto/MRHomePage/SysDicDto.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/DTO/InputDto/MRHomePage/SysDicDto.cs
index c8f21e3bb557b575678f9e171c8f2cf682a25f7f..039a958e6ec2871a458873d545755a086c4a7610 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/DTO/InputDto/MRHomePage/SysDicDto.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/DTO/InputDto/MRHomePage/SysDicDto.cs
@@ -24,4 +24,15 @@ namespace Newtouch.EMR.Domain.DTO.InputDto.MRHomePage
         /// </summary>
         public int ischeck{get;set;}
     }
+    /// <summary>
+    /// 中医症候
+    /// </summary>
+    public class SysDiagZyzh
+    {
+        public string zdCode { get; set; }
+        public string zdmc { get; set; }
+        public string py { get; set; }
+        public string icd10 { get; set; }
+        public string icd10fjm { get; set; }
+    }
 }
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/Entity/MrbasyEntity.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/Entity/MrbasyEntity.cs
index 8bffc590b0b65bcb459112dd9f5721398ce889d5..03273ee75e3bc7db1a0a4763417336f4ed433bbf 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/Entity/MrbasyEntity.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/Entity/MrbasyEntity.cs
@@ -1256,5 +1256,25 @@ namespace Newtouch.EMR.Domain.Entity
 		/// 其他医疗机构转入
 		/// </summary>
 		public string QTYLJGZR { get; set; }
-	}
+        /// <summary>
+        /// 实施临床路径
+        /// </summary>
+        public string ZYSSLCLJ { get; set; }
+        /// <summary>
+        /// 使用医疗机构中药制剂
+        /// </summary>
+        public string SYYLJGZYZJ { get; set; }
+        /// <summary>
+        /// 使用中医诊疗设备
+        /// </summary>
+        public string SYZYZLSB { get; set; }
+        /// <summary>
+        /// 使用中医诊疗技术
+        /// </summary>
+        public string SYZYZLJS { get; set; }
+        /// <summary>
+        /// 辩证施护
+        /// </summary>
+        public string BZSH { get; set; }
+    }
 }
\ No newline at end of file
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/Entity/MrbasyzdEntity.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/Entity/MrbasyzdEntity.cs
index c499a7f3ef361b56b45e7b68cd63f835a39cf117..00f97566ff5c8850d7b0c36592f0dc47da8676c0 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/Entity/MrbasyzdEntity.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/Entity/MrbasyzdEntity.cs
@@ -31,7 +31,15 @@ namespace Newtouch.EMR.Domain.Entity
         /// </summary>
         /// <returns></returns>
         public string ZYH { get; set; }
-
+        /// <summary>
+        /// WM  TCM
+        /// </summary>
+        public string ZDLB { get; set; }
+        /// <summary>
+        /// ZDLX 1主要诊断 2其他诊断 3 中医主病 4 中医主证
+        /// </summary>
+        /// <returns></returns>
+        public string ZDLX { get; set; }
         /// <summary>
         /// ZDOrder
         /// </summary>
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/IDomainServices/ICommonDmnService.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/IDomainServices/ICommonDmnService.cs
index c1f7aa25d3eea85be8f9755864aee156acbbdd88..c279a88d682973d6b72045751b1eed0e2145454d 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/IDomainServices/ICommonDmnService.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/IDomainServices/ICommonDmnService.cs
@@ -165,6 +165,13 @@ namespace Newtouch.EMR.Domain.IDomainServices
         /// <param name="keyword"></param>
         /// <returns></returns>
         IList<xt_bq> GetInpatientArea(string orgId, string keyword);
+        /// <summary>
+        /// 中医症候
+        /// </summary>
+        /// <param name="orgId"></param>
+        /// <param name="keyword"></param>
+        /// <returns></returns>
+        IList<SysDiagZyzh> GetZyzhList(string orgId, string keyword);
 
         #region 医嘱打印
         /// <summary>
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/ValueObjects/MRHomePage/BasyVO.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/ValueObjects/MRHomePage/BasyVO.cs
index e656c6ecef7282be544f3297e17248c94ded0ebc..ba2fbd1f2ab1412978a1bcf385469df34b95a3c6 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/ValueObjects/MRHomePage/BasyVO.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/ValueObjects/MRHomePage/BasyVO.cs
@@ -1138,6 +1138,26 @@ namespace Newtouch.EMR.Domain.ValueObjects.MRHomePage
 		/// 其他医疗机构转入
 		/// </summary>
 		public string QTYLJGZR { get; set; }
+        /// <summary>
+        /// 实施临床路径
+        /// </summary>
+        public string ZYSSLCLJ { get; set; }
+        /// <summary>
+        /// 使用医疗机构中药制剂
+        /// </summary>
+        public string SYYLJGZYZJ { get; set; }
+        /// <summary>
+        /// 使用中医诊疗设备
+        /// </summary>
+        public string SYZYZLSB { get; set; }
+        /// <summary>
+        /// 使用中医诊疗技术
+        /// </summary>
+        public string SYZYZLJS { get; set; }
+        /// <summary>
+        /// 辩证施护
+        /// </summary>
+        public string BZSH { get; set; }
 
-	}
+    }
 }
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/ValueObjects/MRHomePage/PatZDListVO.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/ValueObjects/MRHomePage/PatZDListVO.cs
index 2b2045381347af3d4fe46840576918c1678efebc..ad13bbe101a822af95ba9639975fcb258904cbb8 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Domain/ValueObjects/MRHomePage/PatZDListVO.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Domain/ValueObjects/MRHomePage/PatZDListVO.cs
@@ -28,7 +28,14 @@ namespace Newtouch.EMR.Domain.ValueObjects.MRHomePage
         /// </summary>
         /// <returns></returns>
         public int ZDOrder { get; set; }
-
+        /// <summary>
+        /// 诊断类型WM  1：主要诊断 2：次要诊断  TCM 1：中医主病 2：中医主证
+        /// </summary>
+        public string ZDLX { get; set; }
+        /// <summary>
+        /// WM  TCM
+        /// </summary>
+        public string ZDLB { get; set; }
         /// <summary>
         /// JBDM
         /// </summary>
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.DomainServices/CommonDmnService.cs b/Newtouch.HIS.EMR/Newtouch.EMR.DomainServices/CommonDmnService.cs
index 6a2977b4519e91a44c518d34cc679430fabbfd6b..6425de8ff8baf0fc5b016e878d10a32c5c9414a3 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.DomainServices/CommonDmnService.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.DomainServices/CommonDmnService.cs
@@ -698,6 +698,22 @@ where OrganizeId=@orgId and zt='1' ";
             });
         }
 
+        public IList<SysDiagZyzh> GetZyzhList(string orgId, string keyword)
+        {
+            string sql = @"
+select zhCode zdCode,zhmc zdmc,py,zhCode icd10,'' icd10fjm from NewtouchHIS_Base..xt_zyzh  with(nolock)
+where  zt='1' ";
+
+            if (!string.IsNullOrWhiteSpace(keyword))
+            {
+                sql += " and ((charindex(@keyword,zhmc)>0) or (charindex(@keyword,py)>0) )  ";
+            }
+            return this.FindList<SysDiagZyzh>(sql, new SqlParameter[] {
+                 //new SqlParameter("@orgId",orgId),
+                 new SqlParameter("@keyword",keyword??"")
+            });
+        }
+
         public IList<SysDicDto> DicItemsDetailList(string orgId, string keyword, string types)
         {
             string sql = @"
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.DomainServices/MRHomePage/MRHomePageDmnService.cs b/Newtouch.HIS.EMR/Newtouch.EMR.DomainServices/MRHomePage/MRHomePageDmnService.cs
index 4364379075bf1d0cb44578547292c7e73bb4d902..788b0b02c8a0897f180f7f0529c3b4f926d45cc9 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.DomainServices/MRHomePage/MRHomePageDmnService.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.DomainServices/MRHomePage/MRHomePageDmnService.cs
@@ -351,12 +351,14 @@ select a.Code from [Newtouch_MRMS].[dbo].[mr_dic_bafeetype] a where a.zt='1' and
 
         public IList<PatZDListVO> GetDiagLsit(string orgId, string bah, string zyh)
         {
-            string zdsql = @"SELECT Id,[BAH],[ZYH],[ZDOrder],[JBDM],[JBMC],[RYBQ],[RYBQMS]
+            string zdsql = @"SELECT Id,[BAH],[ZYH],isnull(ZDLB,'WM') ZDLB,CASE WHEN ZDLX IS NULL THEN (CASE WHEN ZDOrder='1' THEN '1' ELSE '2' END)
+    WHEN ZDLX>2 and ZDOrder='1' THEN '1' WHEN ZDLX>2 and ZDOrder>'1' then '2'  ELSE ZDLX END ZDLX 
+,[ZDOrder],[JBDM],[JBMC],[RYBQ],[RYBQMS]
 ,[CYQK],[CYQKMS]
 ,[LastModifierCode],[OrganizeId]
   FROM [dbo].[mr_basy_zd] with(nolock)
 where zt='1' and OrganizeId=@orgId and BAH=@bah and ZYH=@zyh  
-order by ZDOrder ";
+order BY ZDLB, CASE WHEN ZDLX >= 3 THEN 0 ELSE 1 END, ABS(ZDLX),ZDOrder  ";
 
             var zdlist = FindList<PatZDListVO>(zdsql, new SqlParameter[] {
             new SqlParameter("@orgId",orgId),
@@ -399,6 +401,7 @@ order by SSOrder ";
         public void ZdListSubmit(List<BasyZdDto> list, string orgId)
         {
             int i = 1;
+            int zycnt = 1;
             int flag = 0;
             if (list != null && list.Count > 0)
             {
@@ -422,13 +425,18 @@ order by SSOrder ";
                                 zdety.RYBQMS = v.RYBQMS;
                                 zdety.CYQK = v.CYQK;
                                 zdety.CYQKMS = v.CYQKMS;
+                                zdety.ZDLX = v.ZDLX;
+                                zdety.ZDLB = v.ZDLB;
                                 zdety.JBDM = v.JBDM;
                                 zdety.JBMC = v.JBMC;
                                 zdety.zt = v.zt == null ? zdety.zt : v.zt;
 
                                 if (zdety.zt == "1")
                                 {
-                                    zdety.ZDOrder = i;
+                                    if (v.ZDLB == "TCM")
+                                        zdety.ZDOrder = zycnt;
+                                    else
+                                        zdety.ZDOrder = i;
                                 }
 
                                 flag = 1;
@@ -452,9 +460,14 @@ order by SSOrder ";
                         zdety.CYQKMS = v.CYQKMS;
                         zdety.JBDM = v.JBDM;
                         zdety.JBMC = v.JBMC;
+                        zdety.ZDLX = v.ZDLX;
+                        zdety.ZDLB = v.ZDLB;
                         zdety.zt = v.zt;
-                        zdety.ZDOrder = i;
 
+                        if (v.ZDLB == "TCM")
+                            zdety.ZDOrder = zycnt;
+                        else
+                            zdety.ZDOrder = i;
                         zdety.Create(true);
                         _MrbasyzdRepo.Insert(zdety);
                     }
@@ -462,7 +475,10 @@ order by SSOrder ";
                     flag = 0;
                     if (v.zt != "0")
                     {
-                        i++;
+                        if (v.ZDLB == "TCM")
+                            zycnt++;
+                        else
+                            i++;
                     }
 
                 }
@@ -1040,6 +1056,12 @@ order by SSOrder ";
             ety.LXDH = vo.LXDH;
             ety.SJ = vo.SJ;
             ety.BCRQ = vo.BCRQ;
+
+            ety.ZYSSLCLJ = vo.ZYSSLCLJ;
+            ety.SYYLJGZYZJ = vo.SYYLJGZYZJ;
+            ety.SYZYZLSB = vo.SYZYZLSB;
+            ety.SYZYZLJS = vo.SYZYZLJS;
+            ety.BZSH = vo.BZSH;
             return ety;
         }
 
@@ -1201,7 +1223,7 @@ order by SSOrder ";
         /// <returns></returns>
         public IList<PatZDListVO> GetPatHisZDInfo(string bah, string zyh, string orgId, int? zdlb)
         {
-            string sql = @"select @bah BAH,OrganizeId,ZYH,convert(int,zdlx) ZDOrder,JBDM ,JBMC,
+            string sql = @"select @bah BAH,OrganizeId,ZYH,zddl zdlb,zdlx,px ZDOrder,JBDM ,JBMC,
 convert(varchar(2)," + ((int)EnumRybq.y).ToString() + ") RYBQ,'有' RYBQMS," +
 "convert(varchar(2)," + ((int)EnumCyqk.zy).ToString() + @") CYQK,'治愈' CYQKMS
 from V_HIS_InpPatDiag with(nolock)
@@ -1353,7 +1375,7 @@ where a.organizeid=@orgId and a.zyh=@zyh";
                 new SqlParameter("@zyh",zyh),
                 new SqlParameter("@orgId", orgId)});
 
-                var sqlcx2 = "select Id,ZYH,ZDOrder,JBDM,JBMC,CYQK,ZT,CreateTime,CreatorCode,OrganizeId from [Newtouch_EMR].[dbo].[mr_basy_zd]  a  where  " +
+                var sqlcx2 = "select Id,ZYH,ZDLB,ZDLX,ZDOrder,JBDM,JBMC,CYQK,ZT,CreateTime,CreatorCode,OrganizeId from [Newtouch_EMR].[dbo].[mr_basy_zd]  a  where  " +
                     " a.zyh = @zyh and a.OrganizeId = @orgId and a.jbdm <> '999999999' and a.zt = '1' order by ZDOrder ";
                 var data2 = this.FindList<PatZDListVO>(sqlcx2, new SqlParameter[] {
                 new SqlParameter("@zyh",zyh),
@@ -1367,20 +1389,22 @@ where a.organizeid=@orgId and a.zyh=@zyh";
                         //i = int.Parse(datacount.ToString());
                         var zdlx = datacount + i;
                         var sql = "insert into [Newtouch_CIS]..zy_PatDxInfo  " +
-                            "values(@Id, @OrganizeId, @zyh, @zdlb, @zdlx, @zddm, @zdmc, NULL, @CreateTime, @CreatorCode, NULL, NULL, @zt, @cyqk)";
+                            "values(@Id, @OrganizeId, @zyh, @zddl,@zdlb, @zdlx, @zddm, @zdmc, NULL, @CreateTime, @CreatorCode, NULL, NULL, @zt, @cyqk,@px)";
 
                         this.ExecuteSqlCommand(sql, new SqlParameter[] {
                             new SqlParameter("@Id", data2[i].Id),
                             new SqlParameter("@OrganizeId", data2[i].OrganizeId),
                             new SqlParameter("@zyh", data2[i].ZYH),
+                            new SqlParameter("@zddl", data2[i].ZDLB),
                             new SqlParameter("@zdlb", "2"),
-                            new SqlParameter("@zdlx", zdlx),
+                            new SqlParameter("@zdlx", data2[i].ZDLX),
                             new SqlParameter("@zddm", data2[i].JBDM),
                             new SqlParameter("@zdmc", data2[i].JBMC),
                             new SqlParameter("@CreateTime", data2[i].CreateTime),
                             new SqlParameter("@CreatorCode", data2[i].CreatorCode),
                             new SqlParameter("@zt", data2[i].zt),
                             new SqlParameter("@cyqk", data2[i].CYQK),
+                            new SqlParameter("@px", data2[i].ZDOrder),
                             });
                     }
                 }
@@ -1392,20 +1416,22 @@ where a.organizeid=@orgId and a.zyh=@zyh";
                         //i = int.Parse(datacount.ToString());
                         var zdlx = datacount + i;
                         var sql = "insert into [Newtouch_CIS]..zy_PatDxInfo  " +
-                            "values(@Id, @OrganizeId, @zyh, @zdlb, @zdlx, @zddm, @zdmc, NULL, @CreateTime, @CreatorCode, NULL, NULL, @zt, @cyqk)";
+                            "values(@Id, @OrganizeId, @zyh,@zddl, @zdlb, @zdlx, @zddm, @zdmc, NULL, @CreateTime, @CreatorCode, NULL, NULL, @zt, @cyqk,@px)";
 
                         this.ExecuteSqlCommand(sql, new SqlParameter[] {
                             new SqlParameter("@Id", data2[i].Id),
                             new SqlParameter("@OrganizeId", data2[i].OrganizeId),
                             new SqlParameter("@zyh", data2[i].ZYH),
+                            new SqlParameter("@zddl", data2[i].ZDLB),
                             new SqlParameter("@zdlb", "2"),
-                            new SqlParameter("@zdlx", zdlx),
+                            new SqlParameter("@zdlx", data2[i].ZDLX),
                             new SqlParameter("@zddm", data2[i].JBDM),
                             new SqlParameter("@zdmc", data2[i].JBMC),
                             new SqlParameter("@CreateTime", data2[i].CreateTime),
                             new SqlParameter("@CreatorCode", data2[i].CreatorCode),
                             new SqlParameter("@zt", data2[i].zt),
                             new SqlParameter("@cyqk", data2[i].CYQK),
+                            new SqlParameter("@px", data2[i].ZDOrder),
                             });
                     }
                 }
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Infrastructure/EnumMR.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Infrastructure/EnumMR.cs
index 8000d93f39bf28e6c8daebfe8abdfab8cf97c1b5..34116f0eafeba6e39a59e489780ccc7dec667b47 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Infrastructure/EnumMR.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Infrastructure/EnumMR.cs
@@ -159,10 +159,10 @@ namespace Newtouch.EMR.Infrastructure.EnumMR
 	/// </summary>
 	public enum EnumYorN
 	{
-		[Description("否")]
-		N = 1,
 		[Description("是")]
-		Y = 2
+		Y = 1,
+		[Description("否")]
+		N = 2
 	}
 
 
@@ -258,17 +258,28 @@ namespace Newtouch.EMR.Infrastructure.EnumMR
 	/// </summary>
 	public enum EnumZdlxbs
 	{
-		[Description("主要诊断")]
+        [Description("主要诊断")]
 		zy = 1,
 		[Description("次要诊断")]
 		cy = 2
-	}
+        
+    }
+    /// <summary>
+	/// 诊断类型-主从
+	/// </summary>
+	public enum EnumZyZdlxbs
+    {
+        [Description("主病")]
+        zy = 1,
+        [Description("主证")]
+        cy = 2
 
+    }
 
-	/// <summary>
-	/// 入院途径
-	/// </summary>
-	public enum EnumRYTJ
+    /// <summary>
+    /// 入院途径
+    /// </summary>
+    public enum EnumRYTJ
 	{
 		/// <summary>
 		/// 门诊
@@ -526,5 +537,17 @@ namespace Newtouch.EMR.Infrastructure.EnumMR
 		[Description("4期")]
 		forth = 4
 	}
+    /// <summary>
+	///实施临床路径 1中医 2西医 3否
+	/// </summary>
+	public enum EnumZYSSLCLJ
+    {
+        [Description("中医")]
+        TCM = 1,
+        [Description("西医")]
+        WM = 2,
+        [Description("否")]
+        none = 3
+    }
 
 }
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/App_Start/FilterConfig.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Web/App_Start/FilterConfig.cs
index 6f06e6dbb750e6635cf6935e3649b1a777b02550..99d48d2bec3bd8f8acb2fd1ddf837f9320c32a9a 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/App_Start/FilterConfig.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/App_Start/FilterConfig.cs
@@ -19,7 +19,7 @@ namespace Newtouch.EMR.Web
 
             //全局异常捕获
             filters.Add(new HandlerErrorAttribute());
-
+            filters.Add(new VerificationActionFIlterAttribute());
 
         }
     }
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Controllers/MRHomePageController.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Controllers/MRHomePageController.cs
index e5b94e496dc4bf82520a514029b30f2e7dac4388..84cc9ad84d2b2da65613cc23086fe21ad4b3d8a5 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Controllers/MRHomePageController.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Controllers/MRHomePageController.cs
@@ -189,56 +189,62 @@ namespace Newtouch.EMR.Web.Areas.MRHomePage.Controllers
                 var jsbrxx = _MainRecordDmnService.SettlementQuery(zyh, this.OrganizeId);
                 //是否同步动态参数信息
                 var dtcsxx = _MainRecordDmnService.DiagnosticSave(Code, this.OrganizeId);
-
+                //结算病人是否允许新增修改诊断 ON 可编辑  OFF 不可编辑
+                var outpatDiagModify = _MainRecordDmnService.DiagnosticSave("OutpatDiagModifyOpen", this.OrganizeId);
                 //判断是否结算病人
-                if (jsbrxx.Count>0)
+                if (jsbrxx.Count > 0)
                 {
-                    //参数修改时间为空时取创建时间
-                    var uptime = dtcsxx[0].LastModifyTime.ToString() == null || dtcsxx[0].LastModifyTime.ToString() == "" ? dtcsxx[0].CreateTime : dtcsxx[0].LastModifyTime;
-                    //判断结算时间大于参数的修改或创建时间
-                    if ((jsbrxx[0].CreateTime > uptime) && (dtcsxx[0].Value == "OFF" || dtcsxx[0].Value == "off"))
+                    if (outpatDiagModify.Count > 0)
                     {
-                        //return Success("已结算病人不能添加诊断信息");
-                        data = "已结算病人不能添加诊断信息";
+                        if (outpatDiagModify[0].Value == "OFF" || outpatDiagModify[0].Value == "off")
+                        {
+                            data = "已结算病人不能添加/修改诊断信息";
+                        }
+                        else
+                        {
+                            //保存诊断
+                            _MainRecordDmnService.ZdListSubmit(dto, OrganizeId);
+                            data = "诊断信息保存成功";
+                            if (dtcsxx.Count > 0)
+                            {
+                                if (dtcsxx[0].Value == "ON" || dtcsxx[0].Value == "on")
+                                {
+                                    //同步诊断信息至CIS出院诊断
+                                    _MainRecordDmnService.SynchronizationZD(zyh, this.OrganizeId);
+                                }
+                            }
+                        }
                     }
-                    //判断结算时间小于参数的修改或创建时间
-                    else if ((jsbrxx[0].CreateTime < uptime) && (dtcsxx[0].Value == "ON" || dtcsxx[0].Value == "on"))
-                    {
+                    else {
                         //保存诊断
                         _MainRecordDmnService.ZdListSubmit(dto, OrganizeId);
                         data = "诊断信息保存成功";
-                    }
-                    else {
-                        //return Success("不能添加诊断信息");
-                        data = "不能添加诊断信息";
+                        if (dtcsxx.Count > 0)
+                        {
+                            if (dtcsxx[0].Value == "ON" || dtcsxx[0].Value == "on")
+                            {
+                                //同步诊断信息至CIS出院诊断
+                                _MainRecordDmnService.SynchronizationZD(zyh, this.OrganizeId);
+                            }
+                        }
+
                     }
                 }
                 else {
                     //没有结算并且参数开启时同步和保存诊断
-                    if (dtcsxx[0].Value=="ON" || dtcsxx[0].Value == "on")
-                    {
-                        //保存诊断
-                        _MainRecordDmnService.ZdListSubmit(dto, OrganizeId);
-                        //同步诊断信息
-                        _MainRecordDmnService.SynchronizationZD(zyh, this.OrganizeId);
-                        data = "诊断信息保存成功";
-                    }
-                    else if (dtcsxx[0].Value == "OFF" || dtcsxx[0].Value == "off")
-                    {
-                        //保存诊断
-                        _MainRecordDmnService.ZdListSubmit(dto, OrganizeId);
-                        data = "诊断信息保存成功";
+                    _MainRecordDmnService.ZdListSubmit(dto, OrganizeId);
+                    data = "诊断信息保存成功";
+
+                    if (dtcsxx.Count > 0) {
+                        if (dtcsxx[0].Value == "ON" || dtcsxx[0].Value == "on")
+                        {
+                            //同步诊断信息
+                            _MainRecordDmnService.SynchronizationZD(zyh, this.OrganizeId);
+                        }
                     }
                 }
-
-
-                //保存诊断
-                //_MainRecordDmnService.ZdListSubmit(dto, OrganizeId);
-                //同步诊断信息
-                //_MainRecordDmnService.SynchronizationZD(zyh, this.OrganizeId);
-
             }
-            data = "{\"data\":\""+ data + "\"}";
+            data = "{\"state\":\"success\",\"data\":\"" + data + "\"}";
             return Content(data.ToJson().ToString());
         }
 
@@ -250,7 +256,14 @@ namespace Newtouch.EMR.Web.Areas.MRHomePage.Controllers
             }
             return Success("手术保存成功");
         }
-
+        /// <summary>
+        /// 病案首页-保存基本信息
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="reldto"></param>
+        /// <param name="keyValue"></param>
+        /// <param name="mbbh"></param>
+        /// <returns></returns>
         public ActionResult SubmitPatBasic(BasyVO dto, BasyRelVO reldto, string keyValue,string mbbh)
         {
             if (!string.IsNullOrWhiteSpace(keyValue))
@@ -281,47 +294,43 @@ namespace Newtouch.EMR.Web.Areas.MRHomePage.Controllers
                     var jsbrxx = _MainRecordDmnService.SettlementQuery(zyh, this.OrganizeId);
                     //是否同步动态参数信息
                     var dtcsxx = _MainRecordDmnService.DiagnosticSave(Code, this.OrganizeId);
-
+                    //结算病人是否允许新增修改诊断
+                    var outpatDiagModify = _MainRecordDmnService.DiagnosticSave("OutpatDiagModifyOpen", this.OrganizeId);
                     //判断是否结算病人
                     if (jsbrxx.Count > 0)
-                    {
-                        //参数修改时间为空时取创建时间
-                        var uptime = dtcsxx[0].LastModifyTime.ToString() == null || dtcsxx[0].LastModifyTime.ToString() == "" ? dtcsxx[0].CreateTime : dtcsxx[0].LastModifyTime;
-                        //判断结算时间大于参数的修改或创建时间
-                        if ((jsbrxx[0].CreateTime > uptime) && (dtcsxx[0].Value == "OFF" || dtcsxx[0].Value == "off"))
+                    { 
+                        if (outpatDiagModify.Count > 0)
                         {
-                            //return Success("已结算病人不能添加诊断信息");
-                            //data = "已结算病人不能添加诊断信息";
+                            // ON 开关开启  可编辑  OFF  不可编辑
+                            if (outpatDiagModify[0].Value != "OFF" || outpatDiagModify[0].Value != "off")
+                            {
+                                //保存诊断
+                                _MainRecordDmnService.ZdListSubmit(zddto, OrganizeId);
+                            }
                         }
-                        //判断结算时间小于参数的修改或创建时间
-                        else if ((jsbrxx[0].CreateTime < uptime) && (dtcsxx[0].Value == "ON" || dtcsxx[0].Value == "on"))
-                        {
+                        else {
                             //保存诊断
                             _MainRecordDmnService.ZdListSubmit(zddto, OrganizeId);
-                            //data = "诊断信息保存成功";
-                        }
-                        else
-                        {
-                            //return Success("不能添加诊断信息");
-                            //data = "不能添加诊断信息";
+                            if (dtcsxx.Count > 0) {
+                                if (dtcsxx[0].Value == "ON" || dtcsxx[0].Value == "on")
+                                {
+                                    //同步诊断信息
+                                    _MainRecordDmnService.SynchronizationZD(zyh, this.OrganizeId);
+                                }
+                            }
                         }
                     }
                     else
                     {
-                        //没有结算并且参数开启时同步和保存诊断
-                        if (dtcsxx[0].Value == "ON" || dtcsxx[0].Value == "on")
-                        {
-                            //保存诊断
-                            _MainRecordDmnService.ZdListSubmit(zddto, OrganizeId);
-                            //同步诊断信息
-                            _MainRecordDmnService.SynchronizationZD(zyh, this.OrganizeId);
-                            //data = "诊断信息保存成功";
-                        }
-                        else if (dtcsxx[0].Value == "OFF" || dtcsxx[0].Value == "off")
+                        //保存诊断
+                        _MainRecordDmnService.ZdListSubmit(zddto, OrganizeId);
+                        if (dtcsxx.Count > 0)
                         {
-                            //保存诊断
-                            _MainRecordDmnService.ZdListSubmit(zddto, OrganizeId);
-                            //data = "诊断信息保存成功";
+                            if (dtcsxx[0].Value == "ON" || dtcsxx[0].Value == "on")
+                            {
+                                //同步诊断信息
+                                _MainRecordDmnService.SynchronizationZD(zyh, this.OrganizeId);
+                            }
                         }
                     }
                 }
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainDiag.cshtml b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainDiag.cshtml
index e3dce284b46550883299217eab15d467150912a2..c2f51e39aabb53eda93b22cc59bee98ee7c0845c 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainDiag.cshtml
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainDiag.cshtml
@@ -10,58 +10,71 @@
 	<div class="dv_tip" style="width:30%;float:right;padding-right:10px;border:2px solid #a6e6a5;height:400px;">
 		<div><input type="hidden" id="zd_rowid" name="zd_rowid" /></div>
 		<div style="padding:50px 20px 50px 20px;">
-			<table class="form">
-				<tr>
-					<th class="formTitle "><span style="color:red;">*</span> 出院诊断：</th>
-					<td class="formValue">
-						<input id="zd_cyzd" name="zd_cyzd" class="form-control" attr-zddm="" attr-ICD10="" autocomplete="off" />
-					</td>
-				</tr>
-				<tr>
-					<th class="formTitle ">出院情况：</th>
-					<td class="formValue">
-						<select id="zd_cyqk" name="zd_cyqk" class="form-control" data-enumtype="EnumCyqk"></select>
-					</td>
-				</tr>
-				<tr>
-					<th class="formTitle ">入院病情：</th>
-					<td class="formValue">
-						<select id="zd_rybq" name="zd_rybq" class="form-control" data-enumtype="EnumRybq"></select>
-					</td>
-				</tr>
-				@*<tr>
-						<th class="formTitle ">诊断类型：</th>
-						<td class="formValue">
-							<select name="zdlx" class="form-control" data-enumtype="EnumZdlxbs">
-								<option>请选择</option>
-							</select>
-						</td>
-					</tr>
-							<tr>
-								<th class="formTitle ">次序</th>
-								<td class="formValue">
-									<input id="zd_px" name="zd_px" class="form-control" />
-								</td>
-							</tr>*@
-				<tr>
-					<th class="formTitle "></th>
-					<td class="formValue">
-						<input id="btn_submit_zd" type="button" class="btn btn-default" value="保存" style="width:80px;background-color:#9cf7cc;float:right;position:center;" />
-					</td>
-				</tr>
-				<tr>
-					<th class="formTitle "></th>
-					<td class="formValue">
-						<input id="btn_del_zd" type="button" class="btn btn-default" value="删除诊断" style="width:80px;background-color:#9cf7cc;float:right;position:center;" />
-					</td>
-				</tr>
-				<tr>
-					<th class="formTitle "></th>
-					<td class="formValue">
-						<input id="btn_reset_zd" type="button" class="btn btn-default" value="刷新列表" style="width:80px;background-color:#9cf7cc;float:right;position:center;" />
-					</td>
-				</tr>
-			</table>
+            <table class="form">
+                <tr>
+                    <th class="formTitle "><span style="color:red;">*</span> 类别：</th>
+                    <td class="formValue">
+                        <label><input type="radio" id="radioTreating" checked="checked" name="optionsRadios" class="optionsRadios formClearIgnore" value="WM" ) />西医</label>
+                        <label><input type="radio" id="radioTreated" name="optionsRadios" class="optionsRadios formClearIgnore" value="TCM" />中医</label>
+                    </td>
+                </tr>
+                <tr id="xyzdlx">
+                    <th class="formTitle ">诊断类型：</th>
+                    <td class="formValue">
+                        <select name="zdlx" id="zdlx" class="form-control" data-enumtype="EnumZdlxbs">
+                        </select>
+                    </td>
+                </tr>
+                <tr id="zyzdlx" style="display:none">
+                    <th class="formTitle ">诊断类型：</th>
+                    <td class="formValue">
+                        <select name="zdlx2" id="zdlx2" class="form-control" data-enumtype="EnumZyZdlxbs">
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle "><span style="color:red;">*</span> 出院诊断：</th>
+                    <td class="formValue">
+                        <input id="zd_cyzd" name="zd_cyzd" class="form-control" attr-zddm="" attr-ICD10="" autocomplete="off" />
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle ">出院情况：</th>
+                    <td class="formValue">
+                        <select id="zd_cyqk" name="zd_cyqk" class="form-control" data-enumtype="EnumCyqk"></select>
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle ">入院病情：</th>
+                    <td class="formValue">
+                        <select id="zd_rybq" name="zd_rybq" class="form-control" data-enumtype="EnumRybq"></select>
+                    </td>
+                </tr>
+                @*<tr>
+            <th class="formTitle ">次序</th>
+            <td class="formValue">
+                <input id="zd_px" name="zd_px" class="form-control" />
+            </td>
+        </tr>*@
+                <tr>
+                    <th class="formTitle "></th>
+                    <td class="formValue">
+                        <input id="btn_submit_zd" type="button" class="btn btn-default" value="保存" style="width:80px;background-color:#9cf7cc;float:right;position:center;" />
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle "></th>
+                    <td class="formValue">
+                        <input id="btn_del_zd" type="button" class="btn btn-default" value="删除诊断" style="width:80px;background-color:#9cf7cc;float:right;position:center;" />
+                    </td>
+                </tr>
+                <tr>
+                    <th class="formTitle "></th>
+                    <td class="formValue">
+                        <input id="btn_reset_zd" type="button" class="btn btn-default" value="刷新列表" style="width:80px;background-color:#9cf7cc;float:right;position:center;" />
+                    </td>
+                </tr>
+            </table>
 		</div>
 	</div>
 </div>
@@ -69,6 +82,13 @@
 	//var addlist = [];
 	var zddata = {};
 	function getzddata() {
+	    var zdlx = "";
+	    if ($("input[name='optionsRadios']:checked").val() == "WM") {
+	        zdlx = $("#zdlx").val();
+	    }
+	    else {
+	        zdlx = $("#zdlx2").val();
+	    }
 		zddata = {
 			BAH: $("#BAH").val(),
 			ZYH: $("#ZYH").val(),
@@ -79,6 +99,8 @@
 			CYQK: $("#zd_cyqk").val(),
 			CYQKMS: $("#zd_cyqk option:selected").text(),
 			ZDOrder: $("#zd_px").val(),
+			ZDLX: zdlx,
+			ZDLB:$("input[name='optionsRadios']:checked").val(),
 			ztsm: ""
 
 		};
@@ -125,7 +147,7 @@
 					//addlist.push(zddata.JBDM);
 				}
 				else {
-					$.modalAlert("诊断已录入", 'error');
+					$.modalAlert("主要诊断/主病已存在或相同诊断已存在。", 'error');
 				}
 
 			}
@@ -166,6 +188,10 @@
 				if (rows.JBDM == newrow.JBDM) {
 					isadd = false;
 				}
+				else if (rows.ZDLB==newrow.ZDLB && rows.ZDLX==newrow.ZDLX&& rows.ZDLX=="1")
+				{
+				    isadd = false;
+				}
 			})
 
 			//if (addlist.length > 0) {
@@ -204,7 +230,18 @@
 				//        return '<input type="button" onclick="btn_edit(' + option.rowid + ')" />';
 				//    }
 				//},
-				{ label: "病案号", name: "BAH", width: 60, align: 'left', editor: "text" },
+                { label: "ZDLB", name: "ZDLB", width: 60, align: 'left', editor: "text", hidden: true },
+                {
+                    label: "诊断类别", name: "ZDLBMC", width: 60, align: 'left', editor: "text", formatter: function (row, option, data) {
+                        if (data.ZDLB == "WM") {
+                            return "西医";
+                        }
+                        else if (data.ZDLB == "TCM") {
+                            return "中医";
+                        }
+                    }
+                },
+                { label: "病案号", name: "BAH", width: 60, align: 'left', editor: "text" },
 				{ label: "住院号", name: "ZYH", width: 60, align: 'left', editor: "text" },
 				{ label: "出院诊断", name: "JBMC", width: 180, align: 'left', editor: "text" },
 				{ label: "疾病编码", name: "JBDM", width: 80, align: 'left', editor: "text" },
@@ -213,13 +250,27 @@
 				{ label: "CYQK", name: "CYQK", hidden: true },
 				{ label: "出院情况", name: "CYQKMS", width: 60, align: 'left', editor: "text" },
 				{ label: "ZDOrder", name: "ZDOrder", hidden: true },
+                { label: "ZDLX", name: "ZDLX", width: 50, hidden: true },
 				{
-					label: "诊断类型", name: "Zdlx", width: 80, align: 'left', editor: "text", formatter: function (row, option, data) {
-						if (data.ZDOrder == 1) {
-							return "主要诊断";
+					label: "诊断类型", name: "Zdlxmc", width: 80, align: 'left', editor: "text", formatter: function (row, option, data) {
+					    if (data.ZDLB == "TCM" && data.ZDLX=="1")
+						{
+						    return "主病";
+						}
+					    else if (data.ZDLB == "TCM" && data.ZDLX == "2") {
+						    return "主证";
+						}
+						else if (data.ZDLB == "WM" && data.ZDLX == "1") {
+						    return "主要诊断";
+						}
+						else if (data.ZDLB == "WM" && data.ZDLX == "2") {
+						    return "次要诊断";
 						}
+					    else if (data.ZDOrder == 1) {
+					       return "主要诊断";
+					   }
 						else
-							return "其他诊断";
+					        return "次要诊断";
 					}
 				},
 				{ label: "zt", name: "zt", hidden: true },
@@ -243,6 +294,15 @@
 				$("#zd_rybq").val(rowData.RYBQ).trigger("change");
 				$("#zd_px").val(rowData.ZDOrder);
 				$("#zd_rowid").val(row);
+				if (rowData.ZDLB == "WM") {
+				    $("input[name='optionsRadios'][value='WM']").prop("checked", true);
+				    $("input[name='optionsRadios'][value='TCM']").prop("checked", false);
+				}
+				else {
+				    $("input[name='optionsRadios'][value='WM']").prop("checked", false);
+				    $("input[name='optionsRadios'][value='TCM']").prop("checked", true);
+				}
+				$('#zdlx').val(rowData.ZDLX);
 			},
 			loadComplete: function () {
 
@@ -259,16 +319,33 @@
 		//SettlementQuery();
 	}
 
-
-	$("#zd_cyzd").zdFloatingSelector({
-		zdlx: "",
-		//ybnhlx: ybnhlx,
+	$("#zd_cyzd").zxyzdFloatingSelector({
+	    ajaxparameters: function ($thisinput) {
+	        var zdlx="";
+	        if ($("input[name='optionsRadios']:checked").val() == "WM") {
+	            zdlx = $("#zdlx").val();
+	        }
+	        else {
+	            zdlx = $("#zdlx2").val();
+	        }
+	        return "keyword=" + $.trim($thisinput.val()) + "&zdlx=" + $("input[name='optionsRadios']:checked").val() + "&zdtype=" + zdlx;
+	    },
 		width: 600,
 		itemdbclickhandler: function ($this) {
 			$("#zd_cyzd").val($this.attr('data-zdmc')).attr("attr-zddm", $this.attr('data-zdCode')).attr("attr-ICD10", $this.attr('data-icd10'));
 		}
 	});
-
+	$("input[name='optionsRadios']").change(function () {
+	    debugger;
+	   
+	    if ($("input[name='optionsRadios']:checked").val() == "WM") {
+	        $("#xyzdlx").show();
+	        $("#zyzdlx").hide() 
+	    } else {
+	        $("#xyzdlx").hide(); 
+	        $("#zyzdlx").show(); 
+	    }
+	})
 	//function btn_edit(val) {
 	//    alert(val);
 	//}
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainEdit.cshtml b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainEdit.cshtml
index 91cac7155e8476b3ea31596ef6ad7c7859f67abf..2ded073b1c181a76fb0ee2afe6928b8ff296a075 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainEdit.cshtml
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainEdit.cshtml
@@ -469,14 +469,14 @@
             $.modalAlert('患者信息 联系人地址没有填写', 'warning');
             return false;
         }
-        if (para.MZZD == "") {
-            $.modalAlert('患者信息 门（急）诊诊断没有填写', 'warning');
-            return false;
-        }
-        if (para.RYZD == "") {
-            $.modalAlert('患者信息 入院诊断没有填写', 'warning');
+        if (para.MZZD == "" && para.RYZD == "") {
+            $.modalAlert('患者信息 门（急）中西医诊断至少填写一个', 'warning');
             return false;
         }
+        //if (para.RYZD == "") {
+        //    $.modalAlert('患者信息 入院诊断没有填写', 'warning');
+        //    return false;
+        //}
         var idCard = para.SFZH;
         let birthday = idCard.substring(6, 10) + "-" + idCard.substring(10, 12) + "-" + idCard.substring(12, 14);
         var ss = getSex();
@@ -853,27 +853,33 @@
             $.modalAlert('没有输血量时，输血反应必须为未输', 'warning');
             return false;
         }
-        if (para.ZFY<=0) {
+        if (ovpraseFloat(para.ZFY)<=0) {
             $.modalAlert('费用信息 患者住院总费用必须大于 0', 'warning');
             return false;
         }
-        if (para.ZFY < para.ZFJE) {
+        if (ovpraseFloat(para.ZFY) < ovpraseFloat(para.ZFJE)) {
             $.modalAlert('费用信息 患者住院总费用必须大于自付金额', 'warning');
             return false;
         }
-        if (para.FSSZLXMF < para.WLZLF ) {
+        if (ovpraseFloat(para.FSSZLXMF) < ovpraseFloat(para.WLZLF) ) {
             $.modalAlert('费用信息 非手术治疗项目费必须大于等于临床物理治疗费', 'warning');
             return false;
         }
-        if (para.SSZLF < (para.MAF + para.SSF)) {
+        if (ovpraseFloat(para.SSZLF) < (ovpraseFloat(para.MAF) + ovpraseFloat(para.SSF))) {
             $.modalAlert('费用信息 手术治疗费必须大于等于麻醉费与手术费之和', 'warning');
             return false;
         }
-        if (para.XYF < para.KJYWF) {
+        if (ovpraseFloat(para.XYF) < ovpraseFloat(para.KJYWF)) {
             $.modalAlert('费用信息 西药费必须大于等于抗菌药物费用', 'warning');
             return false;
         }
     }
+    function ovpraseFloat(val) {
+        if (!val) {
+            val = 0;
+        }
+        return parseFloat(val);
+    }
     //功能键操作区
 	function newtouch_event_f2() {
         var para = getfromPara();
@@ -893,52 +899,48 @@
         })
     }
     //诊断保存
-    function newtouch_event_f3() {
-        var msg = "";
-        var ids = $("#gridzdList").getDataIDs();
-        var rows = [];
-        var i = 0;
-        if (ids.length > 0) {
-            for (i = 0; i < ids.length; i++) {
-                rows.push($("#gridzdList").getRowData(ids[i]));
-            }
-        }
-        $.ajax({
-            url: "/MRHomePage/MRHomePage/SubmitZdList",
-            data: { dto: rows, zyh: $("#ZYH").val(), "Code": "DiagnosticSave" },
-            type: "post",
-            loading: "正在提交数据...",
-            async: false,
-            success: function (data) {
-                var obj = JSON.parse(data);
-                if (obj.data == "") {
-                    $.modalAlert("诊断信息保存成功", 'success');
-                }
-                else {
-                    window.setTimeout(function () {
-                        //var obj = JSON.stringify(data);
-                        console.info(obj); console.info(data);
-                        if (obj.data == "诊断信息保存成功") {
-                            $.modalAlert(obj.data, 'success');
-                            jQuery("#gridzdList").jqGrid().trigger('reloadGrid');
-                        }
-                        else {
-                            $.modalAlert(obj.data, 'warning');
-                        }
-                        //if (obj.state == "success") {
-                        //    $.modalAlert("诊断信息保存成功", 'success');
-                        //    jQuery("#gridzdList").jqGrid().trigger('reloadGrid');
-                        //}wwwwwwwwwwwwwwwwwwwww
-                        //else {
-                        //    $.modalAlert(obj.message, 'warning');
-                        //}
-                    }, 10);
-                }
-
-            }
-        });
+	function newtouch_event_f3() {
+	    var msg = "";
+	    var ids = $("#gridzdList").getDataIDs();
+	    var rows = [];
+	    var i = 0;
+	    if (ids.length > 0) {
+	        for (i = 0; i < ids.length; i++) {
+	            rows.push($("#gridzdList").getRowData(ids[i]));
+	        }
+	    }
+	    $.ajax({
+	        url: "/MRHomePage/MRHomePage/SubmitZdList",
+	        data: { dto: rows, zyh: $("#ZYH").val(), "Code": "DiagnosticSave" },
+	        type: "post",
+	        loading: "正在提交数据...",
+	        async: false,
+	        success: function (data) {debugger;
+	            var obj = JSON.parse(data);
+	            if(obj.state == "success"){
+	                if (obj.data == "") {
+	                    $.modalAlert("诊断信息保存成功", 'success');
+	                }else{
+	                    window.setTimeout(function () {  
+	                        if (obj.data == "诊断信息保存成功") {
+	                            $.modalAlert(obj.data, 'success');
+	                            jQuery("#gridzdList").jqGrid().trigger('reloadGrid');
+	                        }
+	                        else {
+	                            $.modalAlert(obj.data, 'warning');
+	                        }
+	                    }, 10);
+	                }
+	            }else{
+	                $.modalAlert(obj.message, 'warning');
+	            }
+	        },error: function (request, error, ex) {
+	            $.loading(false);
+	            $.modalAlert('保存失败：' + ex, 'error');
+	        }
+	    });
 
-    }
+	}
     //手术列表
     function newtouch_event_f6() {
         var msg = "";
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainPatInfo.cshtml b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainPatInfo.cshtml
index 5d3fc534948101a7f9a0cfabeda6990fd2421c62..b8fda2d0fb3257ad3fac2c0222a9807acf90e92f 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainPatInfo.cshtml
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MRHomePage/Views/MRHomePage/MainPatInfo.cshtml
@@ -293,9 +293,9 @@
                     <td>天</td>
                 </tr>
                 <tr>
-                    <th class="formTitle "><span class="required">*</span> 门（急）诊诊断</th>
+                    <th class="formTitle "><span class="required">*</span> 门(急)诊诊断(中医)</th>
                     <td class="formValue" colspan="4">
-                        <input id="MZZD" name="MZZD" value="" attr-zddm="" attr-ICD10="" class="form-control required" />
+                        <input id="MZZD" name="MZZD" value="" attr-zddm="" attr-ICD10="" class="form-control" />
                     </td>
                     <th class="formTitle "><span class="required">*</span> 疾病编码</th>
                     <td class="formValue" colspan="4">
@@ -304,9 +304,9 @@
                     </td>
                 </tr>
                 <tr>
-                    <th class="formTitle "><span class="required">*</span> 入院诊断</th>
+                    <th class="formTitle "><span class="required">*</span> 门(急)诊诊断(西医)</th>
                     <td class="formValue" colspan="4">
-                        <input id="RYZD" name="RYZD" value="" attr-zddm="" attr-ICD10="" class="form-control required" />
+                        <input id="RYZD" name="RYZD" value="" attr-zddm="" attr-ICD10="" class="form-control" />
                     </td>
                     <th class="formTitle "><span class="required">*</span> 疾病编码</th>
                     <td class="formValue" colspan="4">
@@ -314,6 +314,64 @@
                         @*<input id="JBBM" name="JBBM" class="form-control" />*@
                     </td>
                 </tr>
+                <tr>
+                    <th class="formTitle ">实施临床路径</th>
+                    <td class="formValue" colspan="2">
+                        <div style="width:65px; float:left; padding:0px;">
+                            <select id="ZYSSLCLJ" name="ZYSSLCLJ" data-enumtype="EnumZYSSLCLJ" class="form-control" style="width:50px">
+                                <option style="display :none"></option>
+                            </select>
+                            <input style="height:0px;border-width:1px;" class="form-control" />
+
+                        </div>
+                        <span style="float:left;padding-top: 5px;margin-left:14px;">1.中医&nbsp;&nbsp;2.西医&nbsp;&nbsp;3.否</span>
+                    </td>
+                    <th class="formTitle ">使用医疗机构中药制剂</th>
+                    <td class="formValue" colspan="2">
+                        <div style="width:65px; float:left; padding:0px;">
+                            <select id="SYYLJGZYZJ" name="SYYLJGZYZJ" data-enumtype="EnumYorN" class="form-control" style="width:50px">
+                                <option style="display :none"></option>
+                            </select>
+                            <input style="height:0px;border-width:1px;" class="form-control" />
+
+                        </div>
+                        <span style="float:left;padding-top: 5px;margin-left:14px;">1.是&nbsp;&nbsp;2.否</span>
+                    </td>
+                    <th class="formTitle "> 使用中医诊疗设备</th>
+                    <td class="formValue" colspan="2">
+                        <div style="width:65px; float:left; padding:0px;">
+                            <select id="SYZYZLSB" name="SYZYZLSB" data-enumtype="EnumYorN" class="form-control" style="width:50px">
+                                <option style="display :none"></option>
+                            </select>
+                            <input style="height:0px;border-width:1px;" class="form-control" />
+
+                        </div>
+                        <span style="float:left;padding-top: 5px;margin-left:14px;">1.是&nbsp;&nbsp;2.否</span>
+                    </td>
+                    <th class="formTitle "> 使用中医诊疗技术</th>
+                    <td class="formValue" colspan="2">
+                        <div style="width:65px; float:left; padding:0px;">
+                            <select id="SYZYZLJS" name="SYZYZLJS" data-enumtype="EnumYorN" class="form-control" style="width:50px">
+                                <option style="display :none"></option>
+                            </select>
+                            <input style="height:0px;border-width:1px;" class="form-control" />
+
+                        </div>
+                        <span style="float:left;padding-top: 5px;margin-left:14px;">1.是&nbsp;&nbsp;2.否</span>
+                    </td>
+                    @*<th class="formTitle "> 辩证施护</th>*@
+                    <td class="formValue" colspan="2">
+                        <span style="float:left;padding-left:0px;padding-top: 5px; width:50px" class="formTitle">辩证施护</span>
+                        <div style="width:65px; float:left; padding:0px;">
+                            <select id="BZSH" name="BZSH" data-enumtype="EnumYorN" class="form-control" style="width:50px">
+                                <option style="display :none"></option>
+                            </select>
+                            <input style="height:0px;border-width:1px;" class="form-control" />
+
+                        </div>
+                        <span style="float:left;padding-top: 5px;margin-left:5px;">1.是&nbsp;&nbsp;2.否</span>
+                    </td>
+                </tr>
                 <tr>
                     <td colspan="9">
                         <div style="width:265px; float:left;" class="formValue">
@@ -359,7 +417,7 @@
     /************************数据绑定*******************************************/
     //门诊诊断
     $("#MZZD").zdFloatingSelector({
-        zdlx: "WM",
+        zdlx: "TCM",
         //ybnhlx: ybnhlx,
         width: 600,
         itemdbclickhandler: function ($this) {
@@ -368,7 +426,7 @@
         }
     });
     $("#MZZDDM").zdFloatingSelector({
-        zdlx: "WM",
+        zdlx: "TCM",
         //ybnhlx: ybnhlx,
         width: 600,
         itemdbclickhandler: function ($this) {
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MedicalRecordManage/Controllers/MedicalRecordController.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MedicalRecordManage/Controllers/MedicalRecordController.cs
index 69138cb3bc58b5704ae3ea784044d117aca412ff..0f00dcdb6a565d6ba6ba6b0c988be08962604988 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MedicalRecordManage/Controllers/MedicalRecordController.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MedicalRecordManage/Controllers/MedicalRecordController.cs
@@ -525,7 +525,18 @@ namespace Newtouch.EMR.Web.Areas.MedicalRecordManage
 
                     // 用户点击了“保存文档”按钮，
                     // 则试图从WEB请求中加载文档然后保存
-                    loaded = eng.LoadDocumentFromRequestFormData();
+                    int loop = 1;
+                    while (loop < 20) //加载护理记录xml文档存在延迟情况
+                    {
+                        try {
+                            loaded = eng.LoadDocumentFromRequestFormData();
+                        }
+                        catch (Exception er) {
+                            loop++;
+                        }
+                        if (loaded)
+                            break;
+                    }
                     if (loaded)
                     {
                         eng.SaveDocument(currentFileName + blxtmc_hj.Trim() + ".xml", null);
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MedicalRecordManage/Controllers/PatInfoController.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MedicalRecordManage/Controllers/PatInfoController.cs
index cdede3860bb76eac13424a2c27961440c4813aba..6341d3183fc38d3814a65015b070cdbd554e0905 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MedicalRecordManage/Controllers/PatInfoController.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/MedicalRecordManage/Controllers/PatInfoController.cs
@@ -434,16 +434,22 @@ namespace Newtouch.EMR.Web.Areas.MedicalRecordManage
             var zybrxx = _zybrjbxxRepo.FindEntity(p => p.zyh == zyh && p.OrganizeId == this.OrganizeId && p.zt == "1");
 
             var rulseentity = mrwritingrulesRepo.FindEntity(p => p.Bllx == bllx && p.OrganizeId == this.OrganizeId && p.zt == "1");
-            var rulsdate = zybrxx.ryrq.AddDays(rulseentity.RulesDay);
-            if (rulseentity != null && rulseentity.RulesDay != 0)
+            var rulsdate = zybrxx.ryrq;
+            if (rulseentity != null )
             {
-                if (rulsdate <= DateTime.Now)
+                if (rulseentity.RulesDay != 0)
                 {
-                    newblbz = "F";
-                }
-                else {
-                    newblbz = "T";
+                    rulsdate = rulsdate.AddDays(rulseentity.RulesDay);
+                    if (rulsdate <= DateTime.Now)
+                    {
+                        newblbz = "F";
+                    }
+                    else
+                    {
+                        newblbz = "T";
+                    }
                 }
+                
             }
             if (newblbz == "F") //是否有申请记录
             {
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/SystemManage/Controllers/CommonController.cs b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/SystemManage/Controllers/CommonController.cs
index 0c6bc7415c36132067b9b4e02518c4f990b55f33..2e081731946dd3a80558cf1a394354ab170924cd 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/SystemManage/Controllers/CommonController.cs
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Areas/SystemManage/Controllers/CommonController.cs
@@ -6,6 +6,7 @@ using Newtouch.Core.Common.Utils;
 using Newtouch.EMR.Domain.Entity;
 using Newtouch.EMR.Domain.IDomainServices;
 using Newtouch.EMR.Domain.IRepository;
+using Newtouch.EMR.Infrastructure.EnumMR;
 using Newtouch.Tools;
 using System;
 using System.Collections.Generic;
@@ -19,6 +20,7 @@ namespace Newtouch.EMR.Web.Areas.SystemManage.Controllers
     {
         private readonly ICommonDmnService _CommonDmnService;
         private readonly ISysDiagnosisRepo _sysDiagnosisRepo;
+        private readonly ISysTCMSyndromeRepo _sysTcmsyndromeRepo;
         private readonly ISysDepartmentRepo _SysDepartmentRepo;
         private readonly Ibl_bllxRepo _BllxRepo;
         private readonly IBlmblbDmnService _BlmblbDmnService;
@@ -244,14 +246,22 @@ namespace Newtouch.EMR.Web.Areas.SystemManage.Controllers
         /// </summary>
         /// <param name="keyword"></param>
         /// <returns></returns>
-        public JsonResult GetDiagnosisList(string keyword, string zdlx, string ybnhlx)
+        public JsonResult GetDiagnosisList(string keyword, string zdlx, string zdtype,string ybnhlx)
         {
             if (string.IsNullOrEmpty(ybnhlx))
             {
                 ybnhlx = null;
             }
-            var list = _sysDiagnosisRepo.GetList(this.OrganizeId, keyword, zdlx, ybnhlx);
-            return Json(list, JsonRequestBehavior.AllowGet);
+            if (zdtype == ((int)EnumZyZdlxbs.cy).ToString()&&zdlx=="TCM")
+            {
+                //var zzlist = _sysTcmsyndromeRepo.GetList(this.OrganizeId, keyword);
+                var zzlist = _CommonDmnService.GetZyzhList(this.OrganizeId,keyword);
+                return Json(zzlist, JsonRequestBehavior.AllowGet);
+            }
+            else {
+                var list = _sysDiagnosisRepo.GetList(this.OrganizeId, keyword, zdlx, ybnhlx);
+                return Json(list, JsonRequestBehavior.AllowGet);
+            }
         }
 
         public ActionResult GetDiagnosisGrid(Pagination pagination, string keyword, int? zdlx)
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Configs/database.config b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Configs/database.config
index 6eb4cd69b12e1b7e5e94102cc9eefe08674fa1e9..ee52cee003e4c686046cb83d83d1f7652a0eea12 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Configs/database.config
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Configs/database.config
@@ -2,9 +2,10 @@
 <connectionStrings>
 
 	<!-- 数据库 -->
-	<add name="DefaultDbContext" connectionString="Server=192.168.9.190,1433;Initial Catalog=Newtouch_EMR;User ID=sa;Password=Abcd1234" providerName="System.Data.SqlClient" />
+	<add name="DefaultDbContext" connectionString="Server=1.183.188.77;Initial Catalog=Newtouch_EMR;User ID=sa;Password=a1b2c3d4*" providerName="System.Data.SqlClient" />
 
 	<!-- Redis -->
-	<add name="RedisServer" connectionString="192.168.9.190:6379,connectTimeout=500,password=newtouch" />
+	<!--<add name="RedisServer" connectionString="192.168.9.190:6379,connectTimeout=500,password=newtouch" />-->
+  <add name="RedisServer" connectionString="D4A0810795BFABD5DF6D3B4D3A7FF0F03AD6996F3A909BF54748AFF78429F89697C20DDD02726669205CBC798E4C1EB7C73A01D4435A9AA3" />
 
 </connectionStrings>
\ No newline at end of file
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Configs/system.config b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Configs/system.config
index 0121adc6d36f9884d24b75363406819781ec0908..7f92bb00482d23bcde01be486cce260f025c07d2 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Configs/system.config
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Configs/system.config
@@ -18,9 +18,9 @@
 	<add key="AppName" value="新致电子病历系统"/>
 
 	<!-- API地址-统一授权用户身份换取 -->
-	<add key="UAUserInfoGetAPI" value="http://192.168.9.190:7002/api/UA/GetUserInfo/"/>
+	<add key="UAUserInfoGetAPI" value="http://1.183.188.77:8022/api/UA/GetUserInfo/"/>
 	<!-- 页面domain（嵌套其他域页面，并执行js 要设置成同一域）-->
-	<add key="Document_Domain" value="192.168.9.190"/>
+	<add key="Document_Domain" value="1.183.188.77"/>
 
 	<!-- 顶级组织机构Id 157-->
 	<add key="Top_OrganizeId" value="d8ee85f8-d8d1-4b5c-bd9e-1761f44242d8"/>
@@ -28,8 +28,9 @@
 	<!-- 创建新用户 时 默认关联角色 -->
 	<add key="CreateUser_Default_RoleCode" value="DefaultRole"/>
 	<!-- 静态站点的Host -->
-	<add key="SiteStaticHost" value="http://192.168.9.190:8014/"/>
-	<add key="SiteCISAPIHost" value="http://192.168.9.190:7003/"/>
+  <add key="SiteStaticHost" value="http://1.183.188.77:8011/"/>
+
+	<add key="SiteCISAPIHost" value="http://1.183.188.77:8023/"/>
 	<!-- 日志服务的Url -->
 	<add key="His.Log.URL" value="http://222.212.90.137:16007  /"/>
 	<!-- 开关-是否加载左侧菜单树（默认加载） -->
@@ -68,10 +69,10 @@
 	<add key="YBOrgCode" value="3011679"/>
 
 	<!--  ActiveReports 服务地址-->
-	<add key="ReportUrl"  value="http://192.168.9.190:8000/"/>
+	<add key="ReportUrl"  value="http://1.183.188.77:8012/"/>
 	<add key="ReportSystemCode"  value="EMR"/>
 	<!-- 接口中心配置  -->
 	<add key="Token_ApiManage" value="API.Manage"/>
-	<add key="SiteAuthCenterHost" value="http://192.168.9.190:8015/"/>
-	<add key="SiteApiManageHost" value="http://192.168.9.190:8016/"/>
+	<add key="SiteAuthCenterHost" value="http://1.183.188.77:8026/"/>
+	<add key="SiteApiManageHost" value="http://1.183.188.77:8025/"/>
 </appSettings>
\ No newline at end of file
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Content/js/page.common.js b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Content/js/page.common.js
index 898692f1458ce185dc1831da1c686919533db5b2..422ceaa517e9d956185b21d2a6620fbfa040bc8b 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Content/js/page.common.js
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Content/js/page.common.js
@@ -43,6 +43,29 @@ $.fn.departmentFloatingSelector = function (options) {
         }
     });
 }
+//诊断
+$.fn.zxyzdFloatingSelector = function (options) {
+    var defaults = {
+        url: '/SystemManage/Common/GetDiagnosisList',
+        width: 600,
+        height: 300,
+        clickautotrigger: true,
+        caption: "选择诊断",
+        ajaxparameters: null,   //请指定
+        itemdbclickhandler: null,
+        colModel: [
+           { label: '代码', name: 'zdCode', hidden: true },
+           { label: '名称', name: 'zdmc', widthratio: 60 },
+           { label: '拼音', name: 'py', widthratio: 20 },
+           { label: 'icd10', name: 'icd10', widthratio: 20 },
+           { label: 'icd10附加码', name: 'icd10fjm', hidden: true }
+        ]
+    };
+    var options = $.extend(defaults, options);
+
+    $(this).newtouchFloatingSelector(options);
+}
+
 //诊断
 $.fn.zdFloatingSelector = function (options) {
     var defaults = {
diff --git "a/Newtouch.HIS.EMR/Newtouch.EMR.Web/File/Template/\346\212\244\347\220\206\346\226\207\344\271\246/\346\212\244\347\220\206\347\227\205\347\250\213\350\256\260\345\275\225\345\215\225/\346\212\244\347\220\206\350\256\260\345\275\225.xml" "b/Newtouch.HIS.EMR/Newtouch.EMR.Web/File/Template/\346\212\244\347\220\206\346\226\207\344\271\246/\346\212\244\347\220\206\347\227\205\347\250\213\350\256\260\345\275\225\345\215\225/\346\212\244\347\220\206\350\256\260\345\275\225.xml"
index 51276268ecc1810dac3b87c8f61ce1360aeeedbb..d10df515290019fa543395a9dfc7fad78ebf744a 100644
--- "a/Newtouch.HIS.EMR/Newtouch.EMR.Web/File/Template/\346\212\244\347\220\206\346\226\207\344\271\246/\346\212\244\347\220\206\347\227\205\347\250\213\350\256\260\345\275\225\345\215\225/\346\212\244\347\220\206\350\256\260\345\275\225.xml"
+++ "b/Newtouch.HIS.EMR/Newtouch.EMR.Web/File/Template/\346\212\244\347\220\206\346\226\207\344\271\246/\346\212\244\347\220\206\347\227\205\347\250\213\350\256\260\345\275\225\345\215\225/\346\212\244\347\220\206\350\256\260\345\275\225.xml"
@@ -560,7 +560,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                             
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -570,7 +570,6 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -580,7 +579,6 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -590,7 +588,6 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -600,7 +597,6 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -610,7 +606,6 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -620,7 +615,6 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -630,7 +624,6 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -640,7 +633,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                             
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -650,7 +643,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                           
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -660,7 +653,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                             
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -670,7 +663,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                           
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -680,7 +673,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                           
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -690,7 +683,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                            
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -700,7 +693,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                           
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -710,7 +703,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                           
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -720,7 +713,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                           
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -730,7 +723,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                          
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -740,7 +733,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                           
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -750,7 +743,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                         
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -760,7 +753,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                            
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -776,7 +769,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -786,7 +779,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -796,7 +789,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -806,7 +799,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -816,7 +809,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -826,7 +819,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -836,7 +829,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -846,7 +839,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -856,7 +849,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -866,7 +859,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -876,7 +869,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -886,7 +879,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -896,7 +889,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -906,7 +899,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -916,7 +909,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -926,7 +919,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -936,7 +929,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -946,7 +939,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -956,7 +949,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -966,7 +959,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -976,7 +969,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -992,7 +985,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1002,7 +995,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1012,7 +1005,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1022,7 +1015,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1032,7 +1025,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1042,7 +1035,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1052,7 +1045,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1062,7 +1055,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1072,7 +1065,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1082,7 +1075,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1092,7 +1085,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1102,7 +1095,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1112,7 +1105,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1122,7 +1115,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1132,7 +1125,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1142,7 +1135,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1152,7 +1145,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1162,7 +1155,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1172,7 +1165,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1182,7 +1175,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1192,7 +1185,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1208,7 +1201,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1218,7 +1211,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1228,7 +1221,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1238,7 +1231,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1248,7 +1241,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1258,7 +1251,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1268,7 +1261,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1278,7 +1271,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1288,7 +1281,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1298,7 +1291,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1308,7 +1301,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1318,7 +1311,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1328,7 +1321,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1338,7 +1331,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1348,7 +1341,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1358,7 +1351,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1368,7 +1361,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1378,7 +1371,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1388,7 +1381,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1398,7 +1391,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1408,7 +1401,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1424,7 +1417,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1434,7 +1427,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1444,7 +1437,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1454,7 +1447,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1464,7 +1457,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1474,7 +1467,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1484,7 +1477,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1494,7 +1487,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1504,7 +1497,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1514,7 +1507,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1524,7 +1517,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1534,7 +1527,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1544,7 +1537,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1554,7 +1547,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1564,7 +1557,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1574,7 +1567,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1584,7 +1577,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1594,7 +1587,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1604,7 +1597,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1614,7 +1607,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
@@ -1624,7 +1617,7 @@
                               <Element xsi:type="XParagraphFlag" StyleIndex="8" />
                            </XElements>
                            <GridLine>
-                              <Visible>true</Visible>
+                               
                               <GridSpanInCM>0.1</GridSpanInCM>
                            </GridLine>
                         </Element>
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/MedicalRecordManage/MedicalRecord/DC_Cache/cache-DCSoft-FontFileNamager.dat b/Newtouch.HIS.EMR/Newtouch.EMR.Web/MedicalRecordManage/MedicalRecord/DC_Cache/cache-DCSoft-FontFileNamager.dat
index 0a1bcd022c7b747fc5a083781c90644dab01d0f6..0614651bfd8ea6fe9e2e2eac13f442c7caf775c1 100644
Binary files a/Newtouch.HIS.EMR/Newtouch.EMR.Web/MedicalRecordManage/MedicalRecord/DC_Cache/cache-DCSoft-FontFileNamager.dat and b/Newtouch.HIS.EMR/Newtouch.EMR.Web/MedicalRecordManage/MedicalRecord/DC_Cache/cache-DCSoft-FontFileNamager.dat differ
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/MedicalRecordManage/MedicalRecord/DC_Cache/cache-dcsoft-font10.dat b/Newtouch.HIS.EMR/Newtouch.EMR.Web/MedicalRecordManage/MedicalRecord/DC_Cache/cache-dcsoft-font10.dat
index 4c45456f191342be6df25f815b20f86f18ee71f3..bd41fd1f6fb63dc33535027e025d14189d1347bd 100644
Binary files a/Newtouch.HIS.EMR/Newtouch.EMR.Web/MedicalRecordManage/MedicalRecord/DC_Cache/cache-dcsoft-font10.dat and b/Newtouch.HIS.EMR/Newtouch.EMR.Web/MedicalRecordManage/MedicalRecord/DC_Cache/cache-dcsoft-font10.dat differ
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Newtouch.EMR.Web.csproj b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Newtouch.EMR.Web.csproj
index 3df9a04aef68bf2e52809f2735660eaeb866a158..9d2fcc69871f106d4dd7ba16ab6be4dba05ac841 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Newtouch.EMR.Web.csproj
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Newtouch.EMR.Web.csproj
@@ -88,6 +88,10 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="MsgPack, Version=0.8.0.0, Culture=neutral, PublicKeyToken=a2625990d5dc0167, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\openhis\his-dll-common\dlls\MsgPack.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Properties/PublishProfiles/FolderProfile.pubxml b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Properties/PublishProfiles/FolderProfile.pubxml
index 4d294bdb1c3ed8f306d5cfa1129bf7874466c136..6ec449c2ec3b88218b76fa62a098ab51cd738404 100644
--- a/Newtouch.HIS.EMR/Newtouch.EMR.Web/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/Newtouch.HIS.EMR/Newtouch.EMR.Web/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,9 +10,9 @@
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <publishUrl>..\..\publish\EMR</publishUrl>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <publishUrl>D:\Pulish\emr</publishUrl>
+    <DeleteExistingFiles>True</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Newtouch.HIS.PDS/Newtouch.HIS.DomainServices/HospitalizationPharmacy/DispenseIndexInfoDmnService.cs b/Newtouch.HIS.PDS/Newtouch.HIS.DomainServices/HospitalizationPharmacy/DispenseIndexInfoDmnService.cs
index d59e226b0432fd13560344a623c891afc5403f8a..0c2a6f556f4f691d9f5c4473a96e2da30a27b43d 100644
--- a/Newtouch.HIS.PDS/Newtouch.HIS.DomainServices/HospitalizationPharmacy/DispenseIndexInfoDmnService.cs
+++ b/Newtouch.HIS.PDS/Newtouch.HIS.DomainServices/HospitalizationPharmacy/DispenseIndexInfoDmnService.cs
@@ -1735,10 +1735,10 @@ FROM (
 	,dbo.f_getYfbmYpComplexYpSlandDw(d.zxdwsl, @yfbmCode, d.ypCode, @OrganizeId) slStr, CONCAT(d.yl,d.yldw) ylStr, rdb.zytyapplyno
 	,d.dj, LTRIM(RTRIM(d.ph)) ph, LTRIM(RTRIM(d.pc)) pc, d.zhyz, rdb.applyNo, rdbd.Id rdbdId
 	FROM (
-		SELECT SUM(s.zxdwsl) zxdwsl, s.pc, s.ph, s.ypCode, s.yzId, s.zxId, s.zyh, s.fybz, s.zhyz
+		SELECT lyxh,SUM(s.zxdwsl) zxdwsl, s.pc, s.ph, s.ypCode, s.yzId, s.zxId, s.zyh, s.fybz, s.zhyz
 		,s.patientName, s.cw, s.yl, s.yldw, s.pcmc, s.zh, s.zlff, s.dj, s.je, s.yzxz
 		FROM (
-			SELECT c.sl zxdwsl, c.pc, c.ph, c.ypCode, a.yzId, a.zxId, a.zyh, a.fybz,a.zhyz
+			SELECT lyxh,c.sl zxdwsl, c.pc, c.ph, c.ypCode, a.yzId, a.zxId, a.zyh, a.fybz,a.zhyz
 			,a.patientName, a.cw, a.yl, a.yldw, a.pcmc, a.zh, a.zlff, a.dj, a.je, a.yzxz 
 			FROM NewtouchHIS_PDS.dbo.zy_ypyzxx(NOLOCK) a 
 			INNER JOIN NewtouchHIS_PDS.dbo.zy_ypyzzxph(NOLOCK) c ON c.zxId=a.zxId AND c.yzId=a.yzId AND c.ypCode=a.ypCode AND c.zt='1' AND c.gjzt='0' AND c.OrganizeId=a.OrganizeId
@@ -1748,7 +1748,7 @@ FROM (
             AND ISNULL(a.zh,'')=ISNULL(c.zh,'')
 			AND a.Id=c.zyypxxId
 			UNION ALL
-			SELECT -1*c.sl zxdwsl, c.pc, c.ph, c.ypCode, a.yzId, a.zxId, a.zyh, a.fybz,a.zhyz
+			SELECT lyxh,-1*c.sl zxdwsl, c.pc, c.ph, c.ypCode, a.yzId, a.zxId, a.zyh, a.fybz,a.zhyz
 			,a.patientName, a.cw, a.yl, a.yldw, a.pcmc, a.zh, a.zlff, a.dj, a.je, a.yzxz
 			FROM NewtouchHIS_PDS.dbo.zy_ypyzxx(NOLOCK) a 
 			INNER JOIN NewtouchHIS_PDS.dbo.zy_tymx(NOLOCK) c ON c.ypCode=a.ypCode AND c.zxId=a.zxId AND c.yzId=a.yzId AND c.OrganizeId=a.OrganizeId AND c.zt='1'
@@ -1759,7 +1759,7 @@ FROM (
 		GROUP BY s.pc, s.ph, s.ypCode, s.yzId, s.zxId, s.patientName, s.cw, s.yl, s.yldw, s.pcmc, s.zh, s.zlff, s.dj, s.je, s.yzxz, s.zyh, s.fybz, s.zhyz
 	) d
 	INNER JOIN dbo.zy_returnDrugApplyBill(NOLOCK) rdb ON  rdb.yzId=d.yzId AND rdb.OrganizeId=@OrganizeId AND rdb.zt='1'
-	INNER JOIN dbo.zy_returnDrugApplyBillDetail(NOLOCK) rdbd ON rdb.Id=rdbd.rabId AND rdbd.ypCode=d.ypCode AND rdbd.zt='1'
+	INNER JOIN dbo.zy_returnDrugApplyBillDetail(NOLOCK) rdbd ON rdb.Id=rdbd.rabId AND rdbd.ypCode=d.ypCode and rdbd.lyxh=d.lyxh AND rdbd.zt='1'
 	INNER JOIN NewtouchHIS_Base.dbo.V_S_xt_yp yp ON yp.ypCode=d.ypCode AND yp.OrganizeId=rdb.OrganizeId
 	INNER JOIN NewtouchHIS_Base.dbo.V_S_xt_ypsx ypsx ON ypsx.ypId=yp.ypId AND ypsx.OrganizeId=@OrganizeId
 	WHERE rdb.ProcessState='0' AND rdb.zytyapplyno=@zytyapplyno
diff --git a/Newtouch.HIS.Sett/Newtouch.HIS.DomainServices/PatientCenter/PatientCenterDmnService.cs b/Newtouch.HIS.Sett/Newtouch.HIS.DomainServices/PatientCenter/PatientCenterDmnService.cs
index c86eeb0c72d8fe57bb1b80e606070f174a0bf172..1da1462541b33a1bbfb386f5c0870cb3a97eb1d5 100644
--- a/Newtouch.HIS.Sett/Newtouch.HIS.DomainServices/PatientCenter/PatientCenterDmnService.cs
+++ b/Newtouch.HIS.Sett/Newtouch.HIS.DomainServices/PatientCenter/PatientCenterDmnService.cs
@@ -388,14 +388,14 @@ left join Drjk_zyfymxsc_input (NOLOCK) fymx on SUBSTRING(fymx.feedetl_sn,3,50)=x
             StringBuilder strSql = new StringBuilder();
             strSql.Append(@"select  a.szje,a.zhye,a.pzh,s.Name Creator,a.CreateTime,a.szxz,b.xjzffsmc,b.xjzffs,a.Id,szjl.Id tId  
 from [NewtouchHIS_Sett].[dbo].[zy_brjbxx] z with(nolock) 
-left join xt_zhszjl a WITH ( NOLOCK ) on z.patid=a.patid and a.OrganizeId=z.OrganizeId and z.zt='1' 
+left join zy_zhszjl a WITH ( NOLOCK ) on z.zyh=a.zyh and a.OrganizeId=z.OrganizeId and z.zt='1' 
 LEFT JOIN xt_xjzffs b WITH ( NOLOCK ) ON a.xjzffs = b.xjzffs 
 LEFT JOIN NewtouchHIS_Base..V_C_Sys_UserStaff s ON s.Account=a.CreatorCode 
-LEFT JOIN dbo.xt_zhszjl szjl ON szjl.pzh = a.pzh 
+LEFT JOIN dbo.zy_zhszjl szjl ON szjl.pzh = a.pzh 
 AND szjl.szje + a.szje = 0 AND a.szje > 0  
 AND szjl.zt = '1' 
 WHERE z.zyh=@zyh and  
-a.OrganizeId = '6d5752a7-234a-403e-aa1c-df8b45d3469f' AND a.zt = '1' 
+a.OrganizeId =@orgId AND a.zt = '1' 
 ORDER BY a.CreateTime DESC");
             SqlParameter[] par = {
                     new SqlParameter("@zyh", zyh),
diff --git a/Newtouch.HIS.Sett/Newtouch.Web/Areas/HospitalizationManage/Views/DischargeSettle/Index.cshtml b/Newtouch.HIS.Sett/Newtouch.Web/Areas/HospitalizationManage/Views/DischargeSettle/Index.cshtml
index 24e1efe6524559dbca4868262d62f55924d060a9..d2601fe30b2deebc60abf61dc632f95fc47cc82e 100644
--- a/Newtouch.HIS.Sett/Newtouch.Web/Areas/HospitalizationManage/Views/DischargeSettle/Index.cshtml
+++ b/Newtouch.HIS.Sett/Newtouch.Web/Areas/HospitalizationManage/Views/DischargeSettle/Index.cshtml
@@ -72,7 +72,7 @@
                 <tr>
                     <th class="formTitle"></th>
                     <td class="formValue">
-                        <label></label>
+                        <input id="ckgrzhbz" type="checkbox" checked="checked" /><label for="ckgrzhbz">个人账户标志</label>
                     </td>
                     <th class="formTitle">费用性质：</th>
                     <td class="formValue">
@@ -899,7 +899,12 @@
     }
     function CQybjs(jzxx, mxxx) {
         debugger;
-        var jzlx = cqPatInfo.mdtrt_cert_type
+        var jzlx = cqPatInfo.mdtrt_cert_type;
+        var acct_used_flag = "";
+        if ($('#ckgrzhbz').is(':checked')) {
+            acct_used_flag = "1";
+        } else
+            acct_used_flag = "0";
         var predata = {
             psn_no: cqPatInfo.grbh,
             mdtrt_cert_type:jzlx,
@@ -913,7 +918,7 @@
             operatorId: '@(opr.rygh)',
             operatorName: '@(opr.UserName)',
             hisId: patModel.zyh,
-            acct_used_flag: "1",
+            acct_used_flag: acct_used_flag,
             dscgTime: mxxx.cyrq
         };
         var ret = CQGetFph();
diff --git a/Newtouch.HIS.Sett/Newtouch.Web/Areas/HospitalizationManage/Views/DischargeSettle/SimulateIndex.cshtml b/Newtouch.HIS.Sett/Newtouch.Web/Areas/HospitalizationManage/Views/DischargeSettle/SimulateIndex.cshtml
index 702174b9536be673ea2702da7773e415cc07e799..bc9b62d9b19202d2e877966a9da3faa23d351f2f 100644
--- a/Newtouch.HIS.Sett/Newtouch.Web/Areas/HospitalizationManage/Views/DischargeSettle/SimulateIndex.cshtml
+++ b/Newtouch.HIS.Sett/Newtouch.Web/Areas/HospitalizationManage/Views/DischargeSettle/SimulateIndex.cshtml
@@ -42,7 +42,7 @@
 					<td class="formValue">
 						<input type="text" class="form-control" id="xmmc" style="width:90%;float:left;" />
 					</td>
-                    <td class="formValue" style="width:400px;float:left;">
+                    <td class="formValue" style="width:500px;float:left;">
                         <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="查询" id="zy_cx" value="查询">
                         <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="未上传" id="zy_btwsc" value="未上传">
                         <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="已上传" id="zy_btysc" value="已上传">
@@ -50,8 +50,9 @@
                         <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="费用回退" id="zy_bft" value="费用回退">
                         <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="费用全退" id="zy_qt" value="费用全退">
                         <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="预结算" id="zy_btyjs" value="预结算">
-                        <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="医保出院结算撤销" id="zy_cyjscx" value="医保出院结算撤销">
+                        <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="[2405]出院撤销" id="zy_cyjscx" value="[2405]出院撤销">
                         <input type="button" class="btn btn-default btn-md btn-default-color" style="width: 15%;" title="事中审核" id="zy_szsh" value="事中审核">
+                        <input id="ckgrzhbz" type="checkbox" checked="checked" /><label for="ckgrzhbz">个人账户标志</label>
                     </td>
 				</tr>
 				<tr>
@@ -654,10 +655,14 @@
                 $.modalAlert("调用医保预结算【SI51】接口失败,请重试", 'error');
             }
         } else {
-
+            var acct_used_flag = "";
+            if ($('#ckgrzhbz').is(':checked')) {
+                acct_used_flag = "1";
+            } else
+                acct_used_flag = "0";
             presett.psn_setlway = "01";
             presett.mid_setl_flag = "0";
-            presett.acct_used_flag = "1";
+            presett.acct_used_flag = acct_used_flag;
             presett.mdtrt_cert_type = "03";
             var ybjsSettReturn;
             //出院办理，再进行预结算 预结算完成之后再进行撤销
diff --git a/Newtouch.HIS.Sett/Newtouch.Web/Areas/OutpatientManage/Views/OutpatCharge/Index2018.cshtml b/Newtouch.HIS.Sett/Newtouch.Web/Areas/OutpatientManage/Views/OutpatCharge/Index2018.cshtml
index e20665a7eddab5d2fed9e764142f41992679fab2..c4d99abd1777e0732749612a36cc3d73df76d06f 100644
--- a/Newtouch.HIS.Sett/Newtouch.Web/Areas/OutpatientManage/Views/OutpatCharge/Index2018.cshtml
+++ b/Newtouch.HIS.Sett/Newtouch.Web/Areas/OutpatientManage/Views/OutpatCharge/Index2018.cshtml
@@ -113,20 +113,20 @@
                     <td class="formValue" style="width: 100px;">
                         @Html.Partial("YibaoRedCardCommon")
                         @*@if (openYbSett == true)
-                            {
-                                <div id="readCard" style="color: orangered; display: none;">
-                                    <input type="button" id="btkhsr" value="证件号输入" class="form-control" style="border-color:#00a0e9; margin-left: 0px;margin-top: 2px; height: 13px;width:4px;float: left;vertical-align:central;" onclick="GetPatSbkh()" />
-                                    <i class="fa fa-id-card" style="font-size: 27px; float: left; vertical-align: central;" title="读卡"></i>
-                                    <select id="readCardCardType" class="form-control" style="width: 33px; height: 22px; padding: 0; margin-left: 1px; margin-top: 2px; float: left; vertical-align: central;">
-                                        @if (openYbSett == true)
-                                        {
-                                            <option value="03">社</option>
-                                        }
-                                        <option value="01">社(电)</option>
-                                        <option value="02">身</option>
-                                    </select>
-                                </div>
-                            }*@
+            {
+                <div id="readCard" style="color: orangered; display: none;">
+                    <input type="button" id="btkhsr" value="证件号输入" class="form-control" style="border-color:#00a0e9; margin-left: 0px;margin-top: 2px; height: 13px;width:4px;float: left;vertical-align:central;" onclick="GetPatSbkh()" />
+                    <i class="fa fa-id-card" style="font-size: 27px; float: left; vertical-align: central;" title="读卡"></i>
+                    <select id="readCardCardType" class="form-control" style="width: 33px; height: 22px; padding: 0; margin-left: 1px; margin-top: 2px; float: left; vertical-align: central;">
+                        @if (openYbSett == true)
+                        {
+                            <option value="03">社</option>
+                        }
+                        <option value="01">社(电)</option>
+                        <option value="02">身</option>
+                    </select>
+                </div>
+            }*@
 
                     </td>
                     <th class="formTitle">特病病种：</th>
@@ -137,7 +137,11 @@
                     <td class="formValue" colspan="1">
                         <input type="button" class="btn btn-default btn-md btn-default-color" id="btbzcx" value="病种查询" onclick="GettbbzSerarch()" />
                     </td>
-
+                    <td class="formValue">
+                        <div class="ckbox">
+                            <input id="ckgrzhbz" type="checkbox" checked="checked" /><label for="ckgrzhbz">个人账户标志</label>
+                        </div>
+                    </td>
                 </tr>
                 <tr>
                     <th class="formTitle" style="width: 50px;">姓名：</th>
@@ -1688,8 +1692,12 @@
     function CQybjs() {
         var mxxx = openAllCfSettPz === 'True' ? MZJS.mxxx : MZJS.current().mxxx;
         var prejsurl = ""; var jsurl = "";
-        
+        var acct_used_flag = "";
         var jzlx = cqPatInfo.mdtrt_cert_type;
+        if ($('#ckgrzhbz').is(':checked')) {
+            acct_used_flag = "1";
+        } else
+            acct_used_flag = "0";
         var predata = {
             operatorId: '@(opr.rygh)', hisId: MZJS.jzxx.hisId, orgId: '@(opr.OrganizeId)',
             operatorName: '@(opr.UserName)', insuplc_admdvs: cqPatInfo.xzqh,
@@ -1718,7 +1726,7 @@
                 predata.psn_setlway= "01";
                 predata.mdtrt_id= MZJS.jzxx.mdtrt_id;
                 predata.chrg_bchno= mxxx.chrg_bchno;
-                predata.acct_used_flag = "1";
+                predata.acct_used_flag = acct_used_flag;
                 predata.insutype = cqPatInfo.xzlx;
                 if (MZJS.jzxx.bzInfo.rs) {
                     predata.med_type = MZJS.jzxx.bzInfo.yllb;
diff --git a/SqlServer/README.md b/SqlServer/README.md
index 30117c6862d0b1775ae26bd021e4f1b64457b287..faa4f2479dbdd1a53433a873946eaa0c64fc9c08 100644
--- a/SqlServer/README.md
+++ b/SqlServer/README.md
@@ -24,7 +24,10 @@
  	1. 修改文件的生成目录
  	2. 修改获取的时间段
  	3. 会获得一个如 `20241101_20241110`的文件夹，直接拖入对应的版本目录下提交即可。（如直接拖入V1.8文件夹）
- 3. 使用脚本 `./Script/ExecSqlInFolder.ps1` 执行一个文件夹下的所有文件
+ 3. 使用脚本 `./Script/GetModuleChange.ps1` 进行对数据库菜单变更的收集
+ 4. 使用脚本 `./Script/Get_GLY_RoleAuthorize.ps1` 进行对数据库管理员角色的菜单变更的收集
+ 5. 使用脚本 `./Script/GetReportChange.ps1` 进行对报表的变更的收集
+ 6. 使用脚本 `./Script/ExecSqlInFolder.ps1` 执行一个文件夹下的所有文件
  
 ## 数据库的清理（敬请期待）
    为方便用户体验查看，当前数据库有少量业务数据，可使用如下脚本进行清理
\ No newline at end of file
diff --git a/SqlServer/Script/GetModuleChange.ps1 b/SqlServer/Script/GetModuleChange.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..72183b1c220791e90f49c13c70c11edc843f95bf
--- /dev/null
+++ b/SqlServer/Script/GetModuleChange.ps1
@@ -0,0 +1,124 @@
+# 设置 SQL Server 实例名称
+$ServerName = "."
+$OutputFolder = "C:\Users\Administrator\Desktop\SQLChange"  # 输出目录路径
+$StartDate = "2024-11-01"  # 起始日期
+$EndDate = "2024-11-10"    # 结束日期
+
+# 创建输出目录（如果不存在）
+$DateFolderName = "$($StartDate.Replace('-', ''))_$($EndDate.Replace('-', ''))"
+$DateOutputFolder = Join-Path -Path $OutputFolder -ChildPath $DateFolderName
+if (!(Test-Path -Path $DateOutputFolder)) {
+    New-Item -ItemType Directory -Path $DateOutputFolder | Out-Null
+}
+
+# 获取所有非系统数据库
+$databases = Invoke-Sqlcmd -ServerInstance $ServerName -Query "
+SELECT name 
+FROM sys.databases 
+WHERE state_desc = 'ONLINE' 
+AND name NOT IN ('master', 'tempdb', 'model', 'msdb');
+" | Select-Object -ExpandProperty name
+
+# 遍历所有数据库
+foreach ($DatabaseName in $databases) {
+    Write-Host "检查数据库: $DatabaseName 是否存在 [Sys_Module] 表"
+
+    # 检查是否存在 [Sys_Module] 表
+    $TableCheckQuery = @"
+    SELECT COUNT(*) AS TableExists
+    FROM [$DatabaseName].INFORMATION_SCHEMA.TABLES
+    WHERE TABLE_NAME = 'Sys_Module';
+"@
+    $TableExists = Invoke-Sqlcmd -ServerInstance $ServerName -Query $TableCheckQuery | Select-Object -ExpandProperty TableExists
+
+    if ($TableExists -eq 0) {
+        Write-Host "数据库 $DatabaseName 中不存在 [Sys_Module] 表，跳过。"
+        continue
+    }
+
+    Write-Host "数据库 $DatabaseName 中存在 [Sys_Module] 表，开始处理。"
+
+    # 定义文件路径
+    $FileName = "${DatabaseName}_moduleChange.sql"
+    $FilePath = Join-Path -Path $DateOutputFolder -ChildPath $FileName
+
+    # 初始化文件内容
+    $SQLContent = ""
+
+    # SQL 查询，获取满足条件的数据
+    $query = @"
+    SELECT *
+    FROM [$DatabaseName].[dbo].[Sys_Module]
+    WHERE 
+        ([CreateTime] < '$StartDate' AND [LastModifyTime] >= '$StartDate' AND [LastModifyTime] <= '$EndDate')
+        OR ([CreateTime] >= '$StartDate' AND [CreateTime] <= '$EndDate');
+"@
+
+    try {
+        # 执行查询并获取数据
+        $Changes = Invoke-Sqlcmd -ServerInstance $ServerName -Database $DatabaseName -Query $query
+
+        # 遍历每条记录并生成 SQL 内容
+        foreach ($Change in $Changes) {
+            # 动态获取字段及其值，排除不必要字段
+            $Fields = $Change.PSObject.Properties | Where-Object {
+                $_.Name -notin @('RowError', 'RowState', 'Table', 'ItemArray', 'HasErrors')
+            } | ForEach-Object {
+                $Name = $_.Name
+                $Value = $_.Value
+                
+                # 如果值是字符串类型，处理单引号
+                if ($Value -is [string]) {
+                    $Value = $Value -replace "'", "''"
+                    $Value = "'$Value'"  # 字符串值用单引号括起来
+                } elseif ($Value -is [datetime]) {
+                    # 日期类型格式化为 SQL 标准格式
+                    $Value = "'" + $Value.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'"
+                } elseif ($Value -eq $null -or [string]::IsNullOrWhiteSpace([string]$Value)) {
+                    Write-Host "处理空值"
+                    $Value = "''"  # 处理 NULL 值
+                }
+                Write-Host "修改后的值是$Name，$Value "
+
+                # 返回字段名和值的键值对
+                [PSCustomObject]@{
+                    FieldName = $Name
+                    FieldValue = $Value
+                }
+            }
+
+            # 生成字段列表和值列表
+            $FieldNames = ($Fields | ForEach-Object { $_.FieldName }) -join ", "
+            $FieldValues = ($Fields | ForEach-Object { $_.FieldValue }) -join ", "
+
+            if ($Change.CreateTime -lt $StartDate -and $Change.LastModifyTime -ge $StartDate -and $Change.LastModifyTime -le $EndDate) {
+                # 添加 UPDATE 语句到内容
+                $SetClause = ($Fields | ForEach-Object { "$($_.FieldName) = $($_.FieldValue)" }) -join ", "
+                $SQLContent += @"
+UPDATE [$DatabaseName].[dbo].[Sys_Module]
+SET $SetClause
+WHERE [Id] = '$($Change.Id)';
+"@ + "`n"
+            } elseif ($Change.CreateTime -ge $StartDate -and $Change.CreateTime -le $EndDate) {
+                # 添加 INSERT 语句到内容
+                $SQLContent += @"
+INSERT INTO [$DatabaseName].[dbo].[Sys_Module] ($FieldNames)
+VALUES ($FieldValues);
+"@ + "`n"
+            }
+        }
+
+        # 将内容写入文件
+        if (-not [string]::IsNullOrWhiteSpace($SQLContent)) {
+            $SQLContent | Out-File -FilePath $FilePath -Encoding utf8
+            Write-Host "已生成文件: $FilePath"
+        } else {
+            Write-Host "数据库 $DatabaseName 中没有满足条件的数据。"
+        }
+
+    } catch {
+        Write-Host "在数据库 $DatabaseName 中处理数据时出错: $($_.Exception.Message)"
+    }
+}
+
+Write-Host "所有语句已保存至 $DateOutputFolder"
\ No newline at end of file
diff --git a/SqlServer/Script/GetReportChange.ps1 b/SqlServer/Script/GetReportChange.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..16603e8af0baba7d82d55cdb6b2bed242eb47805
--- /dev/null
+++ b/SqlServer/Script/GetReportChange.ps1
@@ -0,0 +1,132 @@
+# 配置数据库连接信息
+$ServerName = "."
+$DatabaseName = "NewtouchHIS_Base"
+$Server = "127.0.0.1"
+$User = "sa"
+$Password = "a1+b2*c3=d4"
+$OutputFolder = "C:\Users\Administrator\Desktop\SQLChange"  # 输出目录路径
+$StartDate = "2024-11-06"
+$EndDate = "2024-11-10"
+
+
+# 创建输出目录（如果不存在）
+$DateFolderName = "$($StartDate.Replace('-', ''))_$($EndDate.Replace('-', ''))"
+$DateOutputFolder = Join-Path -Path $OutputFolder -ChildPath $DateFolderName
+if (!(Test-Path -Path $DateOutputFolder)) {
+    New-Item -ItemType Directory -Path $DateOutputFolder | Out-Null
+}
+
+# 定义目标表和文件
+$Tables = @(
+    @{
+        TableName = "Sys_Report"
+        PrimaryKey = "ReportID"
+        OutputFile = Join-Path -Path $DateOutputFolder -ChildPath "ReportChange.sql"
+    },
+    @{
+        TableName = "Sys_ReportTemplate"
+        PrimaryKey = "TemplateID"
+        OutputFile = Join-Path -Path $DateOutputFolder -ChildPath "ReportTemplateChange.sql"
+    }
+)
+
+# 定义数据库连接字符串
+$ConnectionString = "Server=$Server;Database=$DatabaseName;User ID=$User;Password=$Password;"
+
+foreach ($Table in $Tables) {
+    $TableName = $Table.TableName
+    $PrimaryKey = $Table.PrimaryKey
+    $OutputFile = $Table.OutputFile
+
+    # 初始化 SQL 内容
+    $SQLContent = ""
+
+    # 查询符合条件的数据
+    $Query = @"
+SELECT *
+FROM [$DatabaseName].[dbo].[$TableName]
+WHERE (CreateTime BETWEEN '$StartDate' AND '$EndDate')
+   OR (CreateTime < '$StartDate' AND LastModifyTime BETWEEN '$StartDate' AND '$EndDate');
+"@
+
+    try {
+        # 创建数据库连接
+        $Connection = New-Object System.Data.SqlClient.SqlConnection($ConnectionString)
+        $Connection.Open()
+
+        # 创建 SQL 命令
+        $Command = $Connection.CreateCommand()
+        $Command.CommandText = $Query
+
+        # 执行查询并使用 SqlDataReader 逐行读取数据
+        $Reader = $Command.ExecuteReader()
+
+        while ($Reader.Read()) {
+            # 动态获取字段和值，排除不必要的字段
+            $Fields = @()
+            for ($i = 0; $i -lt $Reader.FieldCount; $i++) {
+                $FieldName = $Reader.GetName($i)
+                $FieldValue = $Reader.GetValue($i)
+
+                # 处理值类型
+                if ($FieldValue -is [string]) {
+                    # 针对 XML 或 HTML 内容处理
+                    if ($FieldValue.StartsWith('<?xml') -or $FieldValue.StartsWith('<')) {
+                        $FieldValue = $FieldValue -replace "'", "''"  # 替换单引号为双单引号
+                        $FieldValue = "N'$FieldValue'"               # 使用 N 前缀支持 Unicode
+                    } else {
+                        $FieldValue = $FieldValue -replace "'", "''" # 替换单引号为双单引号
+                        $FieldValue = "'$FieldValue'"               # 普通字符串用单引号括起来
+                    }
+                } elseif ($FieldValue -is [datetime]) {
+                    $FieldValue = "'" + $FieldValue.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'"
+                } elseif ($FieldValue -eq $null -or [string]::IsNullOrWhiteSpace([string]$FieldValue)) {
+                    $FieldValue = "''"
+                }
+
+                $Fields += [PSCustomObject]@{
+                    FieldName = $FieldName
+                    FieldValue = $FieldValue
+                }
+            }
+
+            # 生成字段列表和值列表
+            $FieldNames = ($Fields | ForEach-Object { $_.FieldName }) -join ", "
+            $FieldValues = ($Fields | ForEach-Object { $_.FieldValue }) -join ", "
+
+            if ($Reader["CreateTime"] -ge $StartDate -and $Reader["CreateTime"] -le $EndDate) {
+                # 添加 INSERT 语句到内容
+                $SQLContent += @"
+INSERT INTO [$DatabaseName].[dbo].[$TableName] ($FieldNames)
+VALUES ($FieldValues);
+"@ + "`n"
+            } elseif ($Reader["CreateTime"] -lt $StartDate -and $Reader["LastModifyTime"] -ge $StartDate -and $Reader["LastModifyTime"] -le $EndDate) {
+                # 添加 UPDATE 语句到内容
+                $SetClause = ($Fields | ForEach-Object {
+                    if ($_.FieldName -ne $PrimaryKey) {
+                        "$($_.FieldName) = $($_.FieldValue)"
+                    }
+                }) -join ", "
+                $SQLContent += @"
+UPDATE [$DatabaseName].[dbo].[$TableName]
+SET $SetClause
+WHERE [$PrimaryKey] = $($Reader[$PrimaryKey]);
+"@ + "`n"
+            }
+        }
+
+        # 关闭 SqlDataReader 和数据库连接
+        $Reader.Close()
+        $Connection.Close()
+
+        # 将 SQL 内容写入文件
+        if ($SQLContent -ne "") {
+            $SQLContent | Out-File -FilePath $OutputFile -Encoding UTF8
+            Write-Host "生成文件: $OutputFile"
+        } else {
+            Write-Host "表 $TableName 没有符合条件的数据。"
+        }
+    } catch {
+        Write-Host "查询表 $TableName 时出错: $($_.Exception.Message)"
+    }
+}
diff --git a/SqlServer/Script/Get_GLY_RoleAuthorize.ps1 b/SqlServer/Script/Get_GLY_RoleAuthorize.ps1
new file mode 100644
index 0000000000000000000000000000000000000000..49eaf2b00fecad4a60ad1d4e7690242c6465ae5a
--- /dev/null
+++ b/SqlServer/Script/Get_GLY_RoleAuthorize.ps1
@@ -0,0 +1,122 @@
+# 配置参数
+$ServerName = "."  # 替换为你的 SQL Server 实例连接
+$OutputFolder = "C:\Users\Administrator\Desktop\SQLChange"  # 输出目录路径
+$StartDate = "2024-10-20"  # 起始日期
+$EndDate = "2024-11-10"    # 结束日期
+$OrganizeId = "6d5752a7-234a-403e-aa1c-df8b45d3469f"  # 组织 ID
+$RoleName = "管理员"  # 角色名称
+
+# 创建输出目录（如果不存在）
+$DateFolderName = "$($StartDate.Replace('-', ''))_$($EndDate.Replace('-', ''))"
+$DateOutputFolder = Join-Path -Path $OutputFolder -ChildPath $DateFolderName
+if (!(Test-Path -Path $DateOutputFolder)) {
+    New-Item -ItemType Directory -Path $DateOutputFolder | Out-Null
+}
+
+# 获取所有非系统数据库
+$databases = Invoke-Sqlcmd -ServerInstance $ServerName -Query "
+SELECT name 
+FROM sys.databases 
+WHERE state_desc = 'ONLINE' 
+AND name NOT IN ('master', 'tempdb', 'model', 'msdb');
+" | Select-Object -ExpandProperty name
+
+# 遍历每个数据库
+foreach ($DatabaseName in $databases) {
+    Write-Host "检查数据库: $DatabaseName 是否存在 [Sys_RoleAuthorize] 表"
+
+    # 检查是否存在 [Sys_Module] 表
+    $TableCheckQuery = @"
+    SELECT COUNT(*) AS TableExists
+    FROM [$DatabaseName].INFORMATION_SCHEMA.TABLES
+    WHERE TABLE_NAME = 'Sys_RoleAuthorize';
+"@
+    $TableExists = Invoke-Sqlcmd -ServerInstance $ServerName -Query $TableCheckQuery | Select-Object -ExpandProperty TableExists
+
+    if ($TableExists -eq 0) {
+        Write-Host "数据库 $DatabaseName 中不存在 [Sys_RoleAuthorize] 表，跳过。"
+        continue
+    }
+    
+    Write-Host "处理数据库: $DatabaseName"
+
+    # 查询符合条件的数据
+    $query = @"
+    SELECT *
+    FROM [$DatabaseName].[dbo].[Sys_RoleAuthorize]
+    WHERE [CreateTime] BETWEEN '$StartDate' AND '$EndDate'
+      AND RoleId = (
+          SELECT Id 
+          FROM [$DatabaseName].[dbo].[Sys_Role]
+          WHERE OrganizeId = '$OrganizeId' AND Name = '$RoleName'
+      );
+"@
+
+    try {
+        # 执行查询
+        $Changes = Invoke-Sqlcmd -ServerInstance $ServerName -Database $DatabaseName -Query $query
+
+        if ($Changes.Count -gt 0) {
+            # 创建文件名
+            $FileName = "${DatabaseName}_GLY_RoleAuthorize.sql"
+            $FilePath = Join-Path -Path $DateOutputFolder -ChildPath $FileName
+
+            # 初始化文件内容
+            $SQLContent = @"
+DELETE FROM [$DatabaseName].[dbo].[Sys_RoleAuthorize]
+WHERE RoleId = (
+    SELECT Id 
+    FROM [$DatabaseName].[dbo].[Sys_Role]
+    WHERE OrganizeId = '$OrganizeId' AND Name = '$RoleName'
+);
+"@ + "`n"
+
+            # 遍历查询结果，生成 INSERT 语句
+            foreach ($Change in $Changes) {
+                # 动态获取字段和值
+                $Fields = $Change.PSObject.Properties | Where-Object {
+                $_.Name -notin @('RowError', 'RowState', 'Table', 'ItemArray', 'HasErrors')
+            } | ForEach-Object {
+                    $Name = $_.Name
+                    $Value = $_.Value
+                    
+                    # 处理值类型
+                    if ($Value -is [string]) {
+                        $Value = $Value -replace "'", "''"
+                        $Value = "'$Value'"
+                    } elseif ($Value -is [datetime]) {
+                        $Value = "'" + $Value.ToString("yyyy-MM-dd HH:mm:ss.fff") + "'"
+                    } elseif ($Value -eq $null -or [string]::IsNullOrWhiteSpace([string]$Value)) {
+                        $Value = "''"
+                    }
+                    
+                    [PSCustomObject]@{
+                        FieldName = $Name
+                        FieldValue = $Value
+                    }
+                }
+
+                # 生成字段和值列表
+                $FieldNames = ($Fields | ForEach-Object { $_.FieldName }) -join ", "
+                $FieldValues = ($Fields | ForEach-Object { $_.FieldValue }) -join ", "
+
+                # 添加 INSERT 语句到内容
+                $SQLContent += @"
+INSERT INTO [$DatabaseName].[dbo].[Sys_RoleAuthorize] ($FieldNames)
+VALUES ($FieldValues);
+"@ + "`n"
+            }
+
+            # 写入文件
+            $SQLContent | Out-File -FilePath $FilePath -Encoding utf8
+            Write-Host "生成文件: $FilePath"
+        } else {
+            Write-Host "数据库 $DatabaseName 无符合条件的数据。"
+        }
+
+    } catch {
+        Write-Host "在数据库 $DatabaseName 中查询数据时出错: $($_.Exception.Message)"
+    }
+}
+
+Write-Host "所有处理完成，生成的 SQL 文件保存在 $OutputFolder"
diff --git a/SqlServer/V1.8.1/update_herp_warehouseUser.sql b/SqlServer/V1.8.1/update_herp_warehouseUser.sql
new file mode 100644
index 0000000000000000000000000000000000000000..520955ce7251c84293eaed1a6a4f0f5733688e3c
--- /dev/null
+++ b/SqlServer/V1.8.1/update_herp_warehouseUser.sql
@@ -0,0 +1,10 @@
+USE [NewtouchHIS_herp]
+GO
+DELETE FROM [dbo].[rel_warehouseUser]
+GO
+INSERT [dbo].[rel_warehouseUser] ([Id], [OrganizeId], [warehouseId], [gh], [userName], [zt], [CreatorCode], [CreateTime], [LastModifyTime], [LastModifierCode]) VALUES (N'81b8bab3-638e-4305-b087-b141d3aab88e', N'6d5752a7-234a-403e-aa1c-df8b45d3469f', N'9E645D49-AE90-4D9B-BDB0-364BEA48AB77', N'000000', N'管理员', N'1', N'xzadmin', CAST(N'2024-11-12T10:40:31.277' AS DateTime), NULL, NULL)
+GO
+INSERT [dbo].[rel_warehouseUser] ([Id], [OrganizeId], [warehouseId], [gh], [userName], [zt], [CreatorCode], [CreateTime], [LastModifyTime], [LastModifierCode]) VALUES (N'ab4cd44a-d1c0-43be-b8b7-c70dad1dd03c', N'6d5752a7-234a-403e-aa1c-df8b45d3469f', N'9E645D49-AE90-4D9B-BDB0-364BEA48AB77', N'xzadmin', N'新致演示用户', N'1', N'xzadmin', CAST(N'2024-11-12T10:40:31.277' AS DateTime), NULL, NULL)
+GO
+INSERT [dbo].[rel_warehouseUser] ([Id], [OrganizeId], [warehouseId], [gh], [userName], [zt], [CreatorCode], [CreateTime], [LastModifyTime], [LastModifierCode]) VALUES (N'be04dd7a-2e31-4c94-a888-dd4253edeb6a', N'd15b5415-c3c3-4815-a702-570ae07afc16', N'1D7F9DFE-EBD0-44AE-A4BA-F26AB098DAFF', N'admin', N'admin', N'1', N'MDKyk01', CAST(N'2020-12-09T14:38:34.053' AS DateTime), NULL, NULL)
+GO
diff --git a/WinServiceAPI/NeiMengGuYiBaoApp/Controllers/YiBaoController.cs b/WinServiceAPI/NeiMengGuYiBaoApp/Controllers/YiBaoController.cs
index ceb2ed9b4f0da211d11a4e0079eb87bfc5909e0c..12b66f2a51addcc24f07747c72f2bcad4932732f 100644
--- a/WinServiceAPI/NeiMengGuYiBaoApp/Controllers/YiBaoController.cs
+++ b/WinServiceAPI/NeiMengGuYiBaoApp/Controllers/YiBaoController.cs
@@ -1041,8 +1041,10 @@ namespace NeiMengGuYiBaoApp.Controllers
             input2203.mdtrtinfo.med_type = input.med_type;
             input2203.mdtrtinfo.psn_no = input.psn_no;
             input2203.diseinfo = new List<diseinfo>();
+
+            string orgId = ConfigurationManager.AppSettings["orgId"];
             //获取诊断信息
-            DataTable dtDiseinfo = ClassSqlHelper.QueryICD(1, input.hisId, "", "");
+            DataTable dtDiseinfo = ClassSqlHelper.QueryICD(1, input.hisId, "", "",orgId);
             input2203.diseinfo = Function.ToList<diseinfo>(dtDiseinfo);
 
             string code = "-1";
@@ -1951,13 +1953,13 @@ namespace NeiMengGuYiBaoApp.Controllers
             post.inModel = 1;
 
             DataTable dtHospital = ClassSqlHelper.QueryHospitalInfo(Post2401, 1);
-
+            string orgId = ConfigurationManager.AppSettings["orgId"];
             Input_2401 input2401 = new Input_2401();
             input2401.mdtrtinfo = new mdtrtinfo();
             List<mdtrtinfo> list = Function.ToList<mdtrtinfo>(dtHospital);
             input2401.mdtrtinfo = list[0];
             input2401.diseinfo = new List<diseinfo>();
-            input2401.diseinfo = Function.ToList<diseinfo>(ClassSqlHelper.QueryICD(2, Post2401.hisId, Post2401.mdtrt_id, Post2401.psn_no));
+            input2401.diseinfo = Function.ToList<diseinfo>(ClassSqlHelper.QueryICD(2, Post2401.hisId, Post2401.mdtrt_id, Post2401.psn_no,orgId));
             input2401.mdtrtinfo.psn_no = Post2401.psn_no;
             input2401.mdtrtinfo.dise_codg = Post2401.dise_codg;
             input2401.mdtrtinfo.dise_name = Post2401.dise_name;
@@ -2021,8 +2023,10 @@ namespace NeiMengGuYiBaoApp.Controllers
             input2204.dscginfo.mdtrt_id = input.mdtrt_id;
             input2204.dscginfo.dise_codg = input.dise_codg;
             input2204.dscginfo.dise_name = input.dise_name;
+
+            string orgId = ConfigurationManager.AppSettings["orgId"];
             //查询出院诊断信息
-            DataTable dtDiseinfo = ClassSqlHelper.QueryICD(3, input.hisId, input.mdtrt_id, input.psn_no);
+            DataTable dtDiseinfo = ClassSqlHelper.QueryICD(3, input.hisId, input.mdtrt_id, input.psn_no,orgId);
 
             input2204.diseinfo = new List<diseinfo>();
             input2204.diseinfo = Function.ToList<diseinfo>(dtDiseinfo);
@@ -2067,7 +2071,7 @@ namespace NeiMengGuYiBaoApp.Controllers
             post.inModel = 0;
 
             DataTable dtHospital = ClassSqlHelper.QueryHospitalInfo(Post2401, 2);
-
+            string orgId = ConfigurationManager.AppSettings["orgId"];
             Input_2403 input2403 = new Input_2403();
             input2403.adminfo = new adminfo();
             List<adminfo> list = Function.ToList<adminfo>(dtHospital);
@@ -2077,7 +2081,7 @@ namespace NeiMengGuYiBaoApp.Controllers
             input2403.adminfo.dise_name = Post2401.dise_name;
             input2403.adminfo.adm_bed = Post2401.adm_bed;
             input2403.diseinfo = new List<diseinfo>();
-            input2403.diseinfo = Function.ToList<diseinfo>(ClassSqlHelper.QueryICD(2, Post2401.hisId, Post2401.mdtrt_id, Post2401.psn_no));
+            input2403.diseinfo = Function.ToList<diseinfo>(ClassSqlHelper.QueryICD(2, Post2401.hisId, Post2401.mdtrt_id, Post2401.psn_no,orgId));
             Output_2403 output = new Output_2403();
             string code = "1";
             string json = YiBaoHelper.CallAndSaveLog(input2403, out output, post, out code);
diff --git a/WinServiceAPI/NeiMengGuYiBaoApp/Service/ClassSqlHelper.cs b/WinServiceAPI/NeiMengGuYiBaoApp/Service/ClassSqlHelper.cs
index 23537b7ea75f0e903cb9fefa358d03cd37ef8f91..e4938b62093301a3a7efe451df5edbc1c0347272 100644
--- a/WinServiceAPI/NeiMengGuYiBaoApp/Service/ClassSqlHelper.cs
+++ b/WinServiceAPI/NeiMengGuYiBaoApp/Service/ClassSqlHelper.cs
@@ -139,49 +139,60 @@ namespace NeiMengGuYiBaoApp.Service
         /// <param name="model">1查询门诊 2查询住院入院诊断 3 2查询住院出院诊断</param>
         /// <param name="hisId">门诊号或住院号</param>
         /// <returns></returns>
-        public static DataTable QueryICD(int model, string hisId, string mdtrt_id, string psn_no)
-        {
-            string sql = "";
-            if (model == 1)
-            {
-                sql = string.Format($@"select 1 diag_type,zy.zdlx diag_srt_no,zd.icd10 diag_code,zy.zdmc diag_name,
-isnull(dept.ybksbm, jz.jzks) diag_dept,  isnull(staff.gjybdm, jz.jzys) dise_dor_no, jz.jzysmc dise_dor_name, convert(varchar(20), zy.createtime, 120)diag_time,
- zy.zt vali_flag from Newtouch_CIS.dbo.xt_jz jz
- join Newtouch_CIS.dbo.xt_xyzd zy  on jz.jzId = zy.jzId and jz.OrganizeId = zy.OrganizeId and  jz.zt = 1
- join NewtouchHIS_Base..V_S_Sys_Staff staff on staff.gh = jz.jzys and staff.OrganizeId = jz.OrganizeId
- left join NewtouchHIS_Base.dbo.V_S_Sys_Department dept on dept.Code = jz.jzks and dept.OrganizeId = jz.OrganizeId
- left join NewtouchHIS_Base..V_S_xt_zd zd on zd.zdCode=zy.zdCode and zd.OrganizeId=zy.OrganizeId and zd.zt='1'
- where  jz.mzh ='{hisId}'" +
-                                        $@" union all select 2 diag_type, zy.zdlx diag_srt_no, zd.icd10 diag_code, zy.zdmc diag_name, isnull(dept.ybksbm,jz.jzks) diag_dept,
- isnull(staff.gjybdm, jz.jzys) dise_dor_no, jz.jzysmc dise_dor_name, convert(varchar(20), zy.createtime, 120)diag_time, zy.zt vali_flag
- from Newtouch_CIS.dbo.xt_jz jz
- join Newtouch_CIS.dbo.xt_zyzd zy  on jz.jzId = zy.jzId and jz.OrganizeId = zy.OrganizeId and  jz.zt = 1
-  join NewtouchHIS_Base..V_S_Sys_Staff staff on staff.gh = jz.jzys and staff.OrganizeId = jz.OrganizeId
- left join NewtouchHIS_Base.dbo.V_S_Sys_Department dept on dept.Code = jz.jzks and dept.OrganizeId = jz.OrganizeId
-  left join NewtouchHIS_Base..V_S_xt_zd zd on zd.zdCode=zy.zdCode and zd.OrganizeId=zy.OrganizeId and zd.zt='1'
- where  jz.mzh = '{hisId}'");
-            }
-            else if (model == 2)
-            {
-                sql = string.Format($@"select 1 diag_type, zy.zdpx diag_srt_no, zy.icd10 diag_code, zy.zdmc diag_name, isnull(dept.ybksbm,jz.ks) diag_dept, isnull(ys.gjybdm,jz.doctor) dise_dor_no,ys.Name dise_dor_name, convert(varchar(20), zy.createtime, 120)diag_time, zy.zt vali_flag ,case zy.zdpx when 1 then 1 else 0 end maindiag_flag, '{mdtrt_id}' mdtrt_id ,'{psn_no}' psn_no " +
-                    $@"from NewtouchHis_sett.[dbo].[zy_brjbxx]  jz
- join NewtouchHis_sett.dbo.zy_rydzd zy on jz.zyh = zy.zyh and jz.OrganizeId = zy.OrganizeId and  jz.zt = 1 and zy.zt=1
- join NewtouchHIS_Base.dbo.Sys_Staff ys on jz.doctor = ys.gh 
- left join NewtouchHIS_Base.dbo.V_S_Sys_Department dept on dept.Code=jz.ks and dept.OrganizeId=jz.OrganizeId
-where  jz.zyh = '{hisId}'");
-            }
-            else if (model == 3)
-            {
-                sql = string.Format($"select 1 diag_type,case zy.zdlx when 0 then 1 else 0 end maindiag_flag, zy.zdlx diag_srt_no, zd.icd10 diag_code, zy.zdmc diag_name,  isnull(dept.ybksbm,jz.ks)  diag_dept, isnull(ys.gjybdm,jz.doctor)  dise_dor_no, ys.Name dise_dor_name, convert(varchar(20), zy.createtime, 120)diag_time, '{mdtrt_id}' mdtrt_id ,'{psn_no}' psn_no " +
-                    $@" from NewtouchHis_sett.[dbo].[zy_brjbxx]  jz
- join [Newtouch_CIS].[dbo].[zy_PatDxInfo]  zy on jz.zyh = zy.zyh and jz.OrganizeId = zy.OrganizeId and  jz.zt = 1  and zy.zdlb = 2 and zy.zt = 1 and zy.zdmc <> '999999999'
- join NewtouchHIS_Base.dbo.Sys_Staff ys on jz.doctor = ys.gh
- left join NewtouchHIS_Base.dbo.V_S_Sys_Department dept on dept.Code = jz.ks and dept.OrganizeId = jz.OrganizeId
-  left join NewtouchHIS_Base.[dbo].[xt_zd] zd on zd.zdCode=zy.zddm and zd.OrganizeId=zy.OrganizeId and zd.zt='1'
-" +
-                    $"where  jz.zyh = '{hisId}'");
-            }
-            return platFormServer.Query(sql).Tables[0];
+        public static DataTable QueryICD(int model, string hisId, string mdtrt_id, string psn_no,string orgId)
+        {
+            #region 变更为存储过程
+            //            string sql = "";
+            //            if (model == 1)
+            //            {
+            //                sql = string.Format($@"select 1 diag_type,zy.zdlx diag_srt_no,zd.icd10 diag_code,zy.zdmc diag_name,
+            //isnull(dept.ybksbm, jz.jzks) diag_dept,  isnull(staff.gjybdm, jz.jzys) dise_dor_no, jz.jzysmc dise_dor_name, convert(varchar(20), zy.createtime, 120)diag_time,
+            // zy.zt vali_flag from Newtouch_CIS.dbo.xt_jz jz
+            // join Newtouch_CIS.dbo.xt_xyzd zy  on jz.jzId = zy.jzId and jz.OrganizeId = zy.OrganizeId and  jz.zt = 1
+            // join NewtouchHIS_Base..V_S_Sys_Staff staff on staff.gh = jz.jzys and staff.OrganizeId = jz.OrganizeId
+            // left join NewtouchHIS_Base.dbo.V_S_Sys_Department dept on dept.Code = jz.jzks and dept.OrganizeId = jz.OrganizeId
+            // left join NewtouchHIS_Base..V_S_xt_zd zd on zd.zdCode=zy.zdCode and zd.OrganizeId=zy.OrganizeId and zd.zt='1'
+            // where  jz.mzh ='{hisId}'" +
+            //                                        $@" union all select 2 diag_type, zy.zdlx diag_srt_no, zd.icd10 diag_code, zy.zdmc diag_name, isnull(dept.ybksbm,jz.jzks) diag_dept,
+            // isnull(staff.gjybdm, jz.jzys) dise_dor_no, jz.jzysmc dise_dor_name, convert(varchar(20), zy.createtime, 120)diag_time, zy.zt vali_flag
+            // from Newtouch_CIS.dbo.xt_jz jz
+            // join Newtouch_CIS.dbo.xt_zyzd zy  on jz.jzId = zy.jzId and jz.OrganizeId = zy.OrganizeId and  jz.zt = 1
+            //  join NewtouchHIS_Base..V_S_Sys_Staff staff on staff.gh = jz.jzys and staff.OrganizeId = jz.OrganizeId
+            // left join NewtouchHIS_Base.dbo.V_S_Sys_Department dept on dept.Code = jz.jzks and dept.OrganizeId = jz.OrganizeId
+            //  left join NewtouchHIS_Base..V_S_xt_zd zd on zd.zdCode=zy.zdCode and zd.OrganizeId=zy.OrganizeId and zd.zt='1'
+            // where  jz.mzh = '{hisId}'");
+            //            }
+            //            else if (model == 2)
+            //            {
+            //                sql = string.Format($@"select 1 diag_type, zy.zdpx diag_srt_no, zy.icd10 diag_code, zy.zdmc diag_name, isnull(dept.ybksbm,jz.ks) diag_dept, isnull(ys.gjybdm,jz.doctor) dise_dor_no,ys.Name dise_dor_name, convert(varchar(20), zy.createtime, 120)diag_time, zy.zt vali_flag ,case zy.zdpx when 1 then 1 else 0 end maindiag_flag, '{mdtrt_id}' mdtrt_id ,'{psn_no}' psn_no " +
+            //                    $@"from NewtouchHis_sett.[dbo].[zy_brjbxx]  jz
+            // join NewtouchHis_sett.dbo.zy_rydzd zy on jz.zyh = zy.zyh and jz.OrganizeId = zy.OrganizeId and  jz.zt = 1 and zy.zt=1
+            // join NewtouchHIS_Base.dbo.Sys_Staff ys on jz.doctor = ys.gh 
+            // left join NewtouchHIS_Base.dbo.V_S_Sys_Department dept on dept.Code=jz.ks and dept.OrganizeId=jz.OrganizeId
+            //where  jz.zyh = '{hisId}'");
+            //            }
+            //            else if (model == 3)
+            //            {
+            //                sql = string.Format($"select 1 diag_type,case zy.zdlx when 0 then 1 else 0 end maindiag_flag, zy.zdlx diag_srt_no, zd.icd10 diag_code, zy.zdmc diag_name,  isnull(dept.ybksbm,jz.ks)  diag_dept, isnull(ys.gjybdm,jz.doctor)  dise_dor_no, ys.Name dise_dor_name, convert(varchar(20), zy.createtime, 120)diag_time, '{mdtrt_id}' mdtrt_id ,'{psn_no}' psn_no " +
+            //                    $@" from NewtouchHis_sett.[dbo].[zy_brjbxx]  jz
+            // join [Newtouch_CIS].[dbo].[zy_PatDxInfo]  zy on jz.zyh = zy.zyh and jz.OrganizeId = zy.OrganizeId and  jz.zt = 1  and zy.zdlb = 2 and zy.zt = 1 and zy.zdmc <> '999999999'
+            // join NewtouchHIS_Base.dbo.Sys_Staff ys on jz.doctor = ys.gh
+            // left join NewtouchHIS_Base.dbo.V_S_Sys_Department dept on dept.Code = jz.ks and dept.OrganizeId = jz.OrganizeId
+            //  left join NewtouchHIS_Base.[dbo].[xt_zd] zd on zd.zdCode=zy.zddm and zd.OrganizeId=zy.OrganizeId and zd.zt='1'
+            //" +
+            //                    $"where  jz.zyh = '{hisId}'");
+            //            }
+            //            return platFormServer.Query(sql).Tables[0];
+            #endregion
+
+            Parameters.Clear();
+            Parameters.Add("@hisId", hisId);
+            Parameters.Add("@orgId", orgId);
+            Parameters.Add("@model", model);
+            Parameters.Add("@mdtrt_id", mdtrt_id);
+            Parameters.Add("@psn_no", psn_no);
+            return platFormServer.RunProc_DataTable_WqServer("mzzy_diagxx", Parameters);
+
         }
         /// <summary>
         /// 执行SQL 语句
diff --git a/WinServiceAPI/NeiMengGuYiBaoApp/Service/YiBaoHelper.cs b/WinServiceAPI/NeiMengGuYiBaoApp/Service/YiBaoHelper.cs
index 531bdf1ebda52069dee9f08bb9cbee480a5995b0..bbb45d46b1746aab17c395c9568aaa3b527f09a6 100644
--- a/WinServiceAPI/NeiMengGuYiBaoApp/Service/YiBaoHelper.cs
+++ b/WinServiceAPI/NeiMengGuYiBaoApp/Service/YiBaoHelper.cs
@@ -187,29 +187,34 @@ namespace NeiMengGuYiBaoApp.Service
 
             //input.input.data = InModle;
             //调用【2102】药店结算、【2207】门诊结算、【2304】住院结算三个接口需要验证患者电子凭证密码或医保卡密码（跨省异地不验密）。测试环境会真实的验证电子凭证密码，对接时可以单独调试验密部分，验密没问题后可以使用MOCK模式在测试环境做结算测试。
-
-            if (post.tradiNumber == "2207" || post.tradiNumber == "2304" || post.tradiNumber == "2102")
+            try
             {
-                 if (input.signtype != "MOCK")
+                if (post.tradiNumber == "2207" || post.tradiNumber == "2304" || post.tradiNumber == "2102")
                 {
-                    //string rsapubkey = RSAManager.PemToRSAKey(RSAKeyPub, false);
-                    int cnt = 0;
-                    string pwd = "123456";
-                    //while (cnt <= 1)
-                    //{
-                    //    pwd = Interaction.InputBox("输入卡密码", "密码框", "", -1, -1);   //int型为弹出框坐标,str为返回的输入参数
-                    //    AppLogger.Info("进入SettingsBase密码:" + pwd);
-                    //    if (pwd.Length != 0)
-                    //    {
-                    //        cnt = 2;
-                    //        break;
-                    //    }
-                    //    MessageBox.Show("请输入社保卡密码!");
-                    //    cnt++;
-                    //}
-                    input.cainfo = RSAHelper.EncryptByPublicKey(pwd !=""? pwd:"123456"+ token, RSAKeyPub);
+                    if (input.signtype != "MOCK")
+                    {
+                        //string rsapubkey = RSAManager.PemToRSAKey(RSAKeyPub, false);
+                        int cnt = 0;
+                        string pwd = "123456";
+                        //while (cnt <= 1)
+                        //{
+                        //    pwd = Interaction.InputBox("输入卡密码", "密码框", "", -1, -1);   //int型为弹出框坐标,str为返回的输入参数
+                        //    AppLogger.Info("进入SettingsBase密码:" + pwd);
+                        //    if (pwd.Length != 0)
+                        //    {
+                        //        cnt = 2;
+                        //        break;
+                        //    }
+                        //    MessageBox.Show("请输入社保卡密码!");
+                        //    cnt++;
+                        //}
+                        input.cainfo = RSAHelper.EncryptByPublicKey(pwd != "" ? pwd : "123456" + token, RSAKeyPub);
+                    }
                 }
             }
+            catch (Exception ex) {
+                YiBaoCallLogHelper.Info("异常：" + ex.Message + ex.InnerException);
+            }
         }
 
         private static string GetRecerSysCode(PostBase post, InputPost<InputBase> input)
diff --git a/WinServiceAPI/SqlHelper/RSAHelper.cs b/WinServiceAPI/SqlHelper/RSAHelper.cs
index c74783b294f5b7f5d85cc30c5c19b9dd3be55d03..6eda7fce08e85d5bf494221eec06e7cb58639fa7 100644
--- a/WinServiceAPI/SqlHelper/RSAHelper.cs
+++ b/WinServiceAPI/SqlHelper/RSAHelper.cs
@@ -166,17 +166,18 @@ namespace YiBaoInterface
             IAsymmetricBlockCipher engine = new Pkcs1Encoding(new RsaEngine());
 
             //加密  
-            try
-            {
+            //try
+            //{
                 engine.Init(true, GetPublicKeyParameter(publicKey));
                 byte[] byteData = Encoding_UTF8.GetBytes(data);
                 var ResultData = engine.ProcessBlock(byteData, 0, byteData.Length);
                 return Convert.ToBase64String(ResultData);
-            }
-            catch (Exception ex)
-            {
-                throw ex;
-            }
+            //}
+            //catch (Exception ex)
+            //{
+            //    return "";
+            //    //throw ex;
+            //}
         }
 
         /// <summary>