V2.1

.gitignore

@@ -1,4 +1,4 @@
-# Build results
+# Build results
 [Dd]ebug/
 [Rr]elease/
 x64/
@@ -10,6 +10,14 @@ bld/
 [Oo]bj/
 [Ll]og/
 
+# 保留 log的配置文件
+!**/Log/LogCore.cs
+!**/Log/LogProxy.cs
+!**/Log/LogContent.cs
+!**/Log/LogMain.cs
+!**/Log/AppLogger.cs
+
+
 # Uncomment if you have tasks that create the project's static files in wwwroot
 #wwwroot/
 
@@ -19,12 +27,15 @@ bld/
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of the .nuget directory
-packages/
+/packages/
 # Uncomment if necessary however generally it will be generated by a restore
 !packages/build/
 # Uncomment if necessary however generally it will be generated by a restore
 !packages/repositories.config
 
+# 为了方便将项目中使用的包也进行管理，保留所有子目录中的 packages 文件夹
+!*/packages/
+
 # Windows image file caches
 Thumbs.db
 ehthumbs.db
@@ -97,8 +108,6 @@ StyleCopReport.xml
 *.appxsym
 *.appxrecipe
 
-# Click-Once Directory
-Publish/
 
 # Packaging Directory
 AppPackages/
@@ -118,9 +127,8 @@ BundleArtifacts/
 Package.StoreAssociation.xml
 
 # Visual Studio 2019
-.vscode/
-.vs/
-.vscode/
+**/.vscode/
+**/.vs/
 *.user
 *.suo
 *.userosscache
@@ -208,8 +216,22 @@ jspm_packages/
 
 # 发布配置
 *.pubxml
-# 报表自生成文件
-JSViewer_MVC_Core/.svn
+**/Properties/PublishProfiles/*
+
+# 但保留 FolderProfile.pubxml 和 PublishProfile.pubxml（编译脚本用）
+!**/Properties/PublishProfiles/FolderProfile.pubxml
+!**/Properties/PublishProfiles/PublishProfile.pubxml
+
+# 部署脚本的发布包的生成路径
+[Pp]ublish/
+# 但保留 EmrStatic 和 Report 目录
+![Pp]ublish/EmrStatic/
+![Pp]ublish//Report
+
+# 住院病例不上传
+Newtouch.HIS.EMR/Newtouch.EMR.Web/File/住院病历/
 
+# 运行日志不上传
+**/APPLog/*
 
-**/Properties/PublishProfiles/*
+**/packages/

Newtouch.HIS.Base/Newtouch.HIS.Application/Newtouch.HIS.Application.csproj

@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == '9_190|AnyCPU'">
+    <OutputPath>bin\9_190\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework">
       <HintPath>..\..\his-dll-common\hiscommondlls\EntityFramework.dll</HintPath>

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP.API/Configs/database.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <connectionStrings>
-  <add name="BaseDbContext" connectionString="Server=61.172.179.73,41108;Initial Catalog=NewtouchHIS_Base;User ID=sa;Password=1qazxsw2#" providerName="System.Data.SqlClient" />
+  <add name="BaseDbContext" connectionString="Server=.;Initial Catalog=NewtouchHIS_Base;User ID=.;Password=." providerName="System.Data.SqlClient" />
 
   <!-- Redis -->
   <!--local-->

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP.API/Newtouch.HIS.Base.HOSP.API.csproj

@@ -253,6 +253,9 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == '9_190|AnyCPU'">
+    <OutputPath>bin\</OutputPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP.API/Properties/PublishProfiles/FolderProfile.pubxml

@@ -4,14 +4,15 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\发布地址\开源\BaseApi</PublishUrl>
+    <PublishUrl>..\..\publish\BaseAPI</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
+    <SiteUrlToLaunchAfterPublish />
   </PropertyGroup>
 </Project>

Newtouch.HIS.EMR/Newtouch.EMR.Web/Properties/PublishProfiles/FolderProfile1.pubxml → Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP.API/Properties/PublishProfiles/PublishProfile.pubxml

@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>D:\发布地址\开源\emr</PublishUrl>
+    <PublishUrl>..\..\publish\BaseAPI</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP.Request/Newtouch.HIS.Base.HOSP.Request.csproj

@@ -30,6 +30,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == '9_190|AnyCPU'">
+    <OutputPath>bin\9_190\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtouch.HIS.API.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Areas/PharmacyDrugStorage/Views/SysMedicineStorageIOMode/Index.cshtml

@@ -1,4 +1,5 @@
-@{
+@using Newtouch.Common.Operator;
+@{
     ViewBag.Title = "Index";
     Layout = "~/Views/Shared/_Index.cshtml";
     var opr = Newtouch.Common.Operator.OperatorProvider.GetCurrent();

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Areas/Settlement/Controllers/GzybBaseInfoController.cs

@@ -69,6 +69,11 @@ public ActionResult SaveCodeConstrast(List<GzybCodeContrastEntity> data)
         }
 
         #region 医保目录相关
+        /// <summary>
+        /// 获取目录下载最新版本号
+        /// </summary>
+        /// <param name="tbname"></param>
+        /// <returns></returns>
         public ActionResult GetVer(string tbname)
         {
             switch (tbname)
@@ -122,7 +127,13 @@ public ActionResult GetVer(string tbname)
             return Content(data.ToJson());
         }
 
-
+        /// <summary>
+        /// 获取下载数据
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="tbname"></param>
+        /// <param name="key"></param>
+        /// <returns></returns>
         public ActionResult CatalogueData(Pagination pagination, string tbname, string key)
         {
             pagination.sidx = "VER desc";

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Areas/Sys/Controllers/CombinationController.cs

@@ -95,17 +95,17 @@ public ActionResult GetMldzxxlist(Pagination pagination, string keyword, string
             return Content(data.ToJson());
         }
         /// <summary>
-        /// 根据系统药品信息查询医保对应药品信息
+        /// 根据系统药品信息查询医保对应药品信息 
         /// </summary>
         /// <param name="ypmc"></param>
         /// <param name="py"></param>
         /// <param name="gjybdm"></param>
         /// <param name="pzwh"></param>
         /// <returns></returns>
-        public ActionResult GetYpypxxlist( string ypmc, string py,string gjybdm,string pzwh)
+        public ActionResult GetYpypxxlist( string ypmc, string py,string gjybdm,string pzwh,string dataSource)
 		{
 
-			var data = _sysMedicineDmnService.GetYpypxxlist(this.OrganizeId, ypmc, py, gjybdm, pzwh);
+			var data = _sysMedicineDmnService.GetYpypxxlist(this.OrganizeId, ypmc, py, gjybdm, pzwh,dataSource);
 
 			return Content(data.ToJson());
 		}
@@ -153,9 +153,9 @@ public ActionResult Getclxxlist(Pagination pagination, string keyword, string ty
 		/// <param name="gjybdm"></param>
 		/// <param name="pzwh"></param>
 		/// <returns></returns>
-		public ActionResult GetYbclxxlist(string ypmc, string py, string gjybdm, string pzwh)
+		public ActionResult GetYbclxxlist(string ypmc, string py, string gjybdm, string pzwh,string dataSource)
 		{
-			var data = _sysMedicineDmnService.GetYbclxxlist(this.OrganizeId, ypmc, py, gjybdm, pzwh);
+			var data = _sysMedicineDmnService.GetYbclxxlist(this.OrganizeId, ypmc, py, gjybdm, pzwh, dataSource);
 
 			return Content(data.ToJson());
 		}
@@ -174,7 +174,13 @@ public ActionResult SaveYpcl(G_yb_clxxVO ybxx, int? ypid)
 			};
 			return Content(data.ToJson());
 		}
-
+        /// <summary>
+        /// 获取项目信息集合
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <param name="keyword"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
 		public ActionResult Getxmxxlist(Pagination pagination, string keyword, string type)
 		{
 			pagination.sidx = "CreateTime desc";
@@ -197,9 +203,9 @@ public ActionResult Getxmxxlist(Pagination pagination, string keyword, string ty
 		/// <param name="gjybdm"></param>
 		/// <param name="pzwh"></param>
 		/// <returns></returns>
-		public ActionResult GetYbxmxxlist(string ypmc, string py, string gjybdm, string pzwh)
+		public ActionResult GetYbxmxxlist(string ypmc, string py, string gjybdm, string pzwh,string dataSource)
 		{
-			var data = _sysMedicineDmnService.GetYbxmxxlist(this.OrganizeId, ypmc, py, gjybdm, pzwh);
+			var data = _sysMedicineDmnService.GetYbxmxxlist(this.OrganizeId, ypmc, py, gjybdm, pzwh, dataSource);
 
 			return Content(data.ToJson());
 		}

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Areas/Sys/Views/Combination/Index.cshtml

@@ -39,6 +39,15 @@
 	</div>
 	<div class="panel panel-default">
 		<div class="toolbar" style="margin-left:2%">
+			<div class="btn-group">
+				<label>数据源：</label>
+			</div>
+			<div class="btn-group">
+				<select id="DataSource" name="DataSource"  style="width:200px; height:15px;"  class="form-control form-an">
+					<option value="1">系统视图</option>
+					<option value="2">医保下载目录</option>
+				</select>
+			</div>
 			<div class="btn-group">
 				<label>医保药品名称：</label>
 			</div>
@@ -58,10 +67,10 @@
 				<input id="txt_scqy" type="text" style="width:200px; height:20px;" class="form-control form-an" placeholder="医保生产企业">
 			</div>
 			<div class="btn-group">
-				<input type="button" id="btn_searchyb" class="btn btn-primary" value="查询" />
+				<input type="button" id="btn_searchyb" class="btn btn-primary" value="查询"/>
 			</div>
 			<div class="btn-group">
-				<input type="button" id="btn_save" class="btn btn-primary" value="对码" />
+				<input type="button" id="btn_save" class="btn btn-primary" value="对码"/>
 			</div>
 		</div>
 		@*<table class="form">
@@ -220,7 +229,7 @@
 		$.najax({
 			type: "POST",
 			url: "@Url.Action("GetYpypxxlist")",
-			data: { gjybdm: $("#txt_gjybdm").val(), ypmc: scqy, py:'' , pzwh: pzwh },
+			data: { gjybdm: $("#txt_gjybdm").val(), ypmc: scqy, py:'' , pzwh: pzwh ,dataSource: $("#DataSource").val()},
 			dataType: "json",
 			success: function (ajaxresp) {
 
@@ -246,7 +255,7 @@
 		$.najax({
 			type: "POST",
 			url: "@Url.Action("GetYpypxxlist")",
-			data: { gjybdm: $("#txt_gjybdm").val(), ypmc: '', py: '', pzwh: '' },
+			data: { gjybdm: $("#txt_gjybdm").val(), ypmc: '', py: '', pzwh: '' ,dataSource: $("#DataSource").val()},
 			dataType: "json",
 			success: function (ajaxresp) {
 				$('#gridJSMXList').newtouchLocalDataGrid(null, ajaxresp);
@@ -303,7 +312,7 @@
 
 	function getpostData() {
 		return {
-			keyword: $("#txt_keyword").val(), type: $('input:radio:checked').val()
+			keyword: $("#txt_keyword").val(), type: $('input:radio:checked').val(),dataSource: $("#DataSource").val()
 		};
 	}
 

Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Areas/Sys/Views/Combination/materialIndex.cshtml

@@ -39,6 +39,15 @@
 	</div>
 	<div class="panel panel-default">
 		<div class="toolbar" style="margin-left:2%">
+			<div class="btn-group">
+				<label>数据源：</label>
+			</div>
+			<div class="btn-group">
+				<select id="DataSource" name="DataSource"  style="width:200px; height:15px;"  class="form-control form-an">
+					<option value="1">系统视图</option>
+					<option value="2">医保下载目录</option>
+				</select>
+			</div>
 			<div class="btn-group">
 				<label>医保耗材名称：</label>
 			</div>
@@ -58,10 +67,10 @@
 				<input id="txt_scqy" type="text" style="width:200px; height:20px;" class="form-control form-an" placeholder="医保耗材企业">
 			</div>
 			<div class="btn-group">
-				<input type="button" id="btn_searchyb" class="btn btn-primary" value="查询" />
+				<input type="button" id="btn_searchyb" class="btn btn-primary" value="查询"/>
 			</div>
 			<div class="btn-group">
-				<input type="button" id="btn_save" class="btn btn-primary" value="对码" />
+				<input type="button" id="btn_save" class="btn btn-primary" value="对码"/>
 			</div>
 		</div>
 		@*<table class="form">
@@ -111,13 +120,13 @@
             postData: getpostData(),
               colModel: [
 				  { label: "主键", name: "sfxmId", hidden: true, key: true },
-				{ label: '耗材名称', name: 'sfxmmc', width: 200, align: 'center',  sortable: false, frozen: true},
+				{ label: '耗材名称', name: 'ypmc', width: 200, align: 'center',  sortable: false, frozen: true},
 				{ label: "国家医保代码", name: "gjybdm", width: 180, align: 'center', sortable: false, frozen: true},
 				{ label: "国家医保名称", name: "gjybmc", width: 200, align: 'center', sortable: false },
 				{ label: '规格', name: 'gg', width: 110, align: 'center', sortable: false},
-				  { label: '批准文号', name: 'pzwh', width: 140, align: 'center', sortable: false },
+				  { label: '批准文号', name: 'ypzsm', width: 140, align: 'center', sortable: false },
 				//{ label: '剂型', name: 'jxmc', width: 60, align: 'center', sortable: false },
-				{ label: '生产厂商', name: 'sccj', width: 180, align: 'center', sortable: false },
+				{ label: '生产厂商', name: 'ycmc', width: 180, align: 'center', sortable: false },
 				{
 					label: '自负性质', name: 'zfxz', width: 60, align: 'center', sortable: false, formatter: function (cellvalue, a, b) {
 						switch (parseInt(b.zfxz)) {
@@ -213,7 +222,7 @@
 		$.najax({
 			type: "POST",
 			url: "@Url.Action("GetYbclxxlist")",
-			data: { gjybdm: $("#txt_gjybdm").val(), ypmc: scqy, py: '', pzwh: pzwh },
+			data: { gjybdm: $("#txt_gjybdm").val(), ypmc: scqy, py: '', pzwh: pzwh,dataSource: $("#DataSource").val() },
 			dataType: "json",
 			success: function (ajaxresp) {
 
@@ -239,7 +248,7 @@
 		$.najax({
 			type: "POST",
 			url: "@Url.Action("GetYbclxxlist")",
-			data: { gjybdm: $("#txt_gjybdm").val(), ypmc: '', py: '', pzwh: '' },
+			data: { gjybdm: $("#txt_gjybdm").val(), ypmc: '', py: '', pzwh: '' ,dataSource: $("#DataSource").val()},
 			dataType: "json",
 			success: function (ajaxresp) {
 				$('#gridJSMXList').newtouchLocalDataGrid(null, ajaxresp);
@@ -298,7 +307,7 @@
 
 	function getpostData() {
 		return {
-			keyword: $("#txt_keyword").val(), type: $('input:radio:checked').val()
+			keyword: $("#txt_keyword").val(), type: $('input:radio:checked').val() ,dataSource: $("#DataSource").val()
 		};
 	}