diff --git a/.gitignore b/.gitignore index 6db9ba9..3b16721 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,8 @@ ## ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +s/ + # User-specific files *.rsuser *.suo diff --git a/WebSiteCode/Cmdjy/Cmdjy.sln b/WebSiteCode/Cmdjy/Cmdjy.sln index 622200d..37932b6 100644 --- a/WebSiteCode/Cmdjy/Cmdjy.sln +++ b/WebSiteCode/Cmdjy/Cmdjy.sln @@ -8,6 +8,11 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CmdjyTests", "CmdjyTests\CmdjyTests.csproj", "{812C9905-9C11-40FD-B58F-02C8A880C494}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CmdjyHisFront", "CmdjyHisFront\CmdjyHisFront.csproj", "{E8B0B70C-74D8-419D-94DD-19FF4015C23B}" + ProjectSection(ProjectDependencies) = postProject + {03F35833-1CF9-42BC-BF51-444F7181A967} = {03F35833-1CF9-42BC-BF51-444F7181A967} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HisInterfaceModels", "HisInterfaceModels\HisInterfaceModels.csproj", "{D0FE758C-DA33-45C7-8110-563056A58717}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,6 +32,10 @@ Global {E8B0B70C-74D8-419D-94DD-19FF4015C23B}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8B0B70C-74D8-419D-94DD-19FF4015C23B}.Release|Any CPU.ActiveCfg = Release|Any CPU {E8B0B70C-74D8-419D-94DD-19FF4015C23B}.Release|Any CPU.Build.0 = Release|Any CPU + {D0FE758C-DA33-45C7-8110-563056A58717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D0FE758C-DA33-45C7-8110-563056A58717}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D0FE758C-DA33-45C7-8110-563056A58717}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D0FE758C-DA33-45C7-8110-563056A58717}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WebSiteCode/Cmdjy/Cmdjy/Bll/BackgroundTask.cs b/WebSiteCode/Cmdjy/Cmdjy/Bll/BackgroundTask.cs new file mode 100644 index 0000000..5bbb86f --- /dev/null +++ b/WebSiteCode/Cmdjy/Cmdjy/Bll/BackgroundTask.cs @@ -0,0 +1,119 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System.Timers; +using Autofac; +using CommonClass.Factory; + +namespace Cmdjy.Bll +{ + public interface ITask + { + void Run(); + } + /// + /// 任务管理器 + /// + public interface ITaskManager + { + /// + /// 心跳间隔。毫秒 + /// + double BackgroundTaskHeartbeat { get; set; } + + /// + /// 执行任务 + /// + void Start(); + /// + /// 结束任务 + /// + void Stop(); + } + /// + /// 背景任务注册管理器 + /// + public class TaskManagerRegister:IRegister + { + public void Register(ContainerBuilder builder) { + builder.Register(c => new TaskManager()); + } + } + + /// + /// 背景任务管理器 + /// + public class TaskManager:ITaskManager + { + /// + /// 任务心跳触发计时器 + /// + public static Timer CTimer { get; private set; } + + /// + /// 要执行的背景线程 + /// + public IEnumerable BackTasks { get; set; } + + public double BackgroundTaskHeartbeat { get; set; } = 1000; + + /// + /// 创建一个背景任务管理器 + /// + public TaskManager() { } + + /// + /// 通过提供任务和背景心跳间隔创建背景任务管理器 + /// + /// 背景任务枚举 + /// 心跳 + public TaskManager(IEnumerable bt) { + this.BackTasks = bt; + } + + /// + /// 通过提供任务和背景心跳间隔创建背景任务管理器 + /// + /// 背景任务枚举 + /// 心跳 + public TaskManager(IEnumerable bt,double bh) { + this.BackTasks = bt; this.BackgroundTaskHeartbeat = bh; + } + + /// + /// 开始执行背景任务 + /// + public void Start() { + if(this.BackTasks == null || this.BackTasks.Count() == 0) return; + CTimer = CTimer ?? new Timer(this.BackgroundTaskHeartbeat); + CTimer.Elapsed += this.run; + CTimer.AutoReset = false; + CTimer.Start(); + } + + /// + /// 任务处理事件 + /// + private void run(object sender,ElapsedEventArgs e) { + //启动具体任务 + foreach(var t in this.BackTasks) { + Task.Factory.StartNew(m => { + if(m is ITask task) { + task.Run(); + } + },t as object); + } + //任务启动后重启心跳计时器 + if(sender is Timer timer) { + timer.Start(); + } + } + + public void Stop() { + if(CTimer == null) return; + CTimer.Stop(); + CTimer.Elapsed -= run; + CTimer = null; + } + } +} \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/Cmdjy/Cmdjy.csproj b/WebSiteCode/Cmdjy/Cmdjy/Cmdjy.csproj index 12c3d61..133d89c 100644 --- a/WebSiteCode/Cmdjy/Cmdjy/Cmdjy.csproj +++ b/WebSiteCode/Cmdjy/Cmdjy/Cmdjy.csproj @@ -45,6 +45,12 @@ 4 + + ..\packages\Autofac.4.9.2\lib\net45\Autofac.dll + + + ..\packages\CommonClass.Factory.1.2.0.8\lib\net45\CommonClass.Factory.dll + ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll @@ -184,17 +190,20 @@ + + + @@ -220,6 +229,7 @@ + @@ -272,7 +282,7 @@ - + @@ -288,6 +298,12 @@ + + + {d0fe758c-da33-45c7-8110-563056a58717} + HisInterfaceModels + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/WebSiteCode/Cmdjy/Cmdjy/CommonClass.Factory.Log.txt b/WebSiteCode/Cmdjy/Cmdjy/CommonClass.Factory.Log.txt new file mode 100644 index 0000000..426a96c --- /dev/null +++ b/WebSiteCode/Cmdjy/Cmdjy/CommonClass.Factory.Log.txt @@ -0,0 +1,2 @@ +V8 2018年1月8日 +1、特性注入支持属性注入。接口注入方式暂不支持。 \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/Cmdjy/Controllers/HisUpdataController.cs b/WebSiteCode/Cmdjy/Cmdjy/Controllers/HisUpdataController.cs new file mode 100644 index 0000000..ed7eb4e --- /dev/null +++ b/WebSiteCode/Cmdjy/Cmdjy/Controllers/HisUpdataController.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; + +namespace Cmdjy.Controllers +{ + public class HisUpdataController:Controller + { + // GET: HisUpdata + public ActionResult Index() { + return View(); + } + + public ActionResult PostPrescription() { + + return Json(new { code = 0,msg = "" },JsonRequestBehavior.AllowGet); + } + } + +} \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/Cmdjy/Dal/DjyDbContext.cs b/WebSiteCode/Cmdjy/Cmdjy/Dal/DjyDbContext.cs index 842859a..81f7687 100644 --- a/WebSiteCode/Cmdjy/Cmdjy/Dal/DjyDbContext.cs +++ b/WebSiteCode/Cmdjy/Cmdjy/Dal/DjyDbContext.cs @@ -36,5 +36,9 @@ namespace Cmdjy.Dal /// 代煎药厂商信息 /// public DbSet CompanyInfos { get; set; } + /// + /// 医疗机构信息 + /// + public DbSet HospitalInfos { get; set; } } } \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/Cmdjy/Dal/Tables/HisPrescriptionInfo.cs b/WebSiteCode/Cmdjy/Cmdjy/Dal/Tables/HisPrescriptionInfo.cs index efdb486..b29de70 100644 --- a/WebSiteCode/Cmdjy/Cmdjy/Dal/Tables/HisPrescriptionInfo.cs +++ b/WebSiteCode/Cmdjy/Cmdjy/Dal/Tables/HisPrescriptionInfo.cs @@ -148,6 +148,18 @@ namespace Cmdjy.Dal.Tables /// public string Usage { get; set; } /// + /// 治疗号 + /// + public string Zlh { get; set; } + /// + /// 收费序号 + /// + public int Sfxh { get; set; } + /// + /// 收费费用序号 + /// + public string Sffyxh { get; set; } + /// /// 代煎药厂商代码 /// public string CompanyCode { get; set; } diff --git a/WebSiteCode/Cmdjy/Cmdjy/Dal/Tables/HospitalInfo.cs b/WebSiteCode/Cmdjy/Cmdjy/Dal/Tables/HospitalInfo.cs new file mode 100644 index 0000000..c14db97 --- /dev/null +++ b/WebSiteCode/Cmdjy/Cmdjy/Dal/Tables/HospitalInfo.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Web; + +namespace Cmdjy.Dal.Tables +{ + /// + /// 医疗机构信息 + /// + [Table("HospitalInfo")] + public class HospitalInfo + { + [Key] + public int Id { get; set; } + /// + /// 医疗机构代码 + /// + public string HosCode { get; set; } + /// + /// 医疗机构名称 + /// + public string HosName { get; set; } + /// + /// 前置机地址 + /// + public string FrontAddress { get; set; } + /// + /// 记录状态 + /// + public int Status { get; set; } + } +} \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/Cmdjy/Dal/Wappers/HisDrugInfoWapper.cs b/WebSiteCode/Cmdjy/Cmdjy/Dal/Wappers/HisDrugInfoWapper.cs index b312a8b..0c92f39 100644 --- a/WebSiteCode/Cmdjy/Cmdjy/Dal/Wappers/HisDrugInfoWapper.cs +++ b/WebSiteCode/Cmdjy/Cmdjy/Dal/Wappers/HisDrugInfoWapper.cs @@ -1,11 +1,13 @@ -namespace Cmdjy.Dal.Wappers +using HisInterfaceModels; + +namespace Cmdjy.Dal.Wappers { /// /// 药品信息墙纸 /// public class HisDrugInfoWapper:Dal.Tables.HisDrugInfo { - public HisDrugInfoWapper(ws.HisDrugInfo s) { + public HisDrugInfoWapper(HisDrugInfo s) { if(s == null) return; foreach(var p in s.GetType().GetProperties()) { var tp = this.GetType().GetProperty(p.Name); diff --git a/WebSiteCode/Cmdjy/Cmdjy/Dal/Wappers/HisPrescriptyInfoWapper.cs b/WebSiteCode/Cmdjy/Cmdjy/Dal/Wappers/HisPrescriptyInfoWapper.cs index f680526..4eecd79 100644 --- a/WebSiteCode/Cmdjy/Cmdjy/Dal/Wappers/HisPrescriptyInfoWapper.cs +++ b/WebSiteCode/Cmdjy/Cmdjy/Dal/Wappers/HisPrescriptyInfoWapper.cs @@ -1,9 +1,11 @@ -namespace Cmdjy.Dal.Wappers +using HisInterfaceModels; + +namespace Cmdjy.Dal.Wappers { public class HisPrescriptyInfoWapper:Dal.Tables.HisPrescriptionInfo { public HisPrescriptyInfoWapper() { } - public HisPrescriptyInfoWapper(ws.HisPrescriptionInfo s) { + public HisPrescriptyInfoWapper(HisPrescriptionInfo s) { if(s == null) return; foreach(var p in s.GetType().GetProperties()) { var tp = this.GetType().GetProperty(p.Name); diff --git a/WebSiteCode/Cmdjy/Cmdjy/Web.config b/WebSiteCode/Cmdjy/Cmdjy/Web.config index 106871f..1a21447 100644 --- a/WebSiteCode/Cmdjy/Cmdjy/Web.config +++ b/WebSiteCode/Cmdjy/Cmdjy/Web.config @@ -67,6 +67,10 @@ + + + + diff --git a/WebSiteCode/Cmdjy/Cmdjy/packages.config b/WebSiteCode/Cmdjy/Cmdjy/packages.config index 5c6689e..de8ec17 100644 --- a/WebSiteCode/Cmdjy/Cmdjy/packages.config +++ b/WebSiteCode/Cmdjy/Cmdjy/packages.config @@ -1,7 +1,9 @@  + + diff --git a/WebSiteCode/Cmdjy/Cmdjy/ws/HisInterface.asmx.cs b/WebSiteCode/Cmdjy/Cmdjy/ws/HisInterface.asmx.cs index ae47d48..6f38399 100644 --- a/WebSiteCode/Cmdjy/Cmdjy/ws/HisInterface.asmx.cs +++ b/WebSiteCode/Cmdjy/Cmdjy/ws/HisInterface.asmx.cs @@ -1,12 +1,10 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; +using System.Data.Entity; using System.Web.Services; -using Newtonsoft.Json; using Cmdjy.Dal; using Cmdjy.Dal.Wappers; -using System.Data.Entity; +using HisInterfaceModels; +using Newtonsoft.Json; namespace Cmdjy.ws { @@ -18,12 +16,18 @@ namespace Cmdjy.ws [System.ComponentModel.ToolboxItem(false)] // 若要允许使用 ASP.NET AJAX 从脚本中调用此 Web 服务，请取消注释以下行。 // [System.Web.Script.Services.ScriptService] - public class HisInterface:System.Web.Services.WebService + public class HisInterface:WebService, IHisPostInfo { - [WebMethod(Description = "医疗机构上传处方信息")] - public string PostPrescriptionInfo(HisPrescriptionInfo info) { + public string PostPrescription(string msg) { HisPrescriptionResult result = null; + var info = JsonConvert.DeserializeObject(msg); + if(info == null) { + result = new HisPrescriptionResult { + Code = ResultCode.Exception,PrescriptionId = "0", + Msg = "传送数据解析错误", + }; + } using(var db = DbContextFactory.CreateDbContext()) { var en = new HisPrescriptyInfoWapper(info) as Dal.Tables.HisPrescriptionInfo; en.RawAddress = this.Context.Request.UserHostAddress; @@ -47,8 +51,16 @@ namespace Cmdjy.ws } [WebMethod(Description = "医疗机构上传药品信息")] - public string PostDrugInfo(HisDrugInfo info) { + public string PostDrug(string msg) { HisDrugResult result = null; + var info = JsonConvert.DeserializeObject(msg); + if(info == null) { + result = new HisDrugResult { + Code = ResultCode.Exception,DrugId = "0", + Msg = "传送数据解析错误", + }; + } + using(var db = DbContextFactory.CreateDbContext()) { var en = new HisDrugInfoWapper(info) as Dal.Tables.HisDrugInfo; en.RawAddress = this.Context.Request.UserHostAddress; @@ -71,272 +83,4 @@ namespace Cmdjy.ws return JsonConvert.SerializeObject(result); } } - - /// - /// HIS发送的处方信息 - /// - public class HisPrescriptionInfo - { - /// - /// 处方类型 - /// - public PrescriptionType Type { get; set; } - /// - /// 如果为退方，这里传要退的处方流水号。此编号在下单应答消息中提供 - /// - public string RawRecordId { get; set; } - /// - /// 药品明细数量 - /// - public string DrugCount { get; set; } - /// - /// 处方备注 - /// - public string Remark { get; set; } - /// - /// 带回病房 否 - /// - public string TakeBack { get; set; } - /// - /// "操作类型": "煎药自取", or "操作类型": "煎药快递", or "操作类型": "配药快递" - /// - public string OpType { get; set; } - /// - /// 操作员 - /// - public string OpUser { get; set; } - /// - /// 病区 - /// - public string Area { get; set; } - /// - /// 病床号 - /// - public string Bed { get; set; } - /// - /// 操作时间 - /// - public string OpDatatime { get; set; } - /// - /// 处方号 - /// - public string PrescriptionNo { get; set; } - /// - /// 处方日期 - /// - public string PrescriptionDatatime { get; set; } - /// - /// 单位编号 医疗机构编号 - /// - public string HosNo { get; set; } - /// - /// 医疗机构名称 - /// - public string HosName { get; set; } - /// - /// 发票号 - /// - public string InvoiceNo { get; set; } - /// - /// 病人编号 - /// - public string PatientNo { get; set; } - /// - /// 病人卡号 - /// - public string CardNo { get; set; } - /// - /// 科室名称 - /// - public string DepName { get; set; } - /// - /// 病人年龄 - /// - public string PatientAge { get; set; } - /// - /// 病人生日 - /// - public string PatientBrithday { get; set; } - /// - /// 病人手机号码 - /// - public string PatientMobile { get; set; } - /// - /// 病人电话 - /// - public string PatientPhone { get; set; } - /// - /// 所在区县街道 - /// - public string District { get; set; } - /// - /// 送货地址 - /// - public string PostAddress { get; set; } - /// - /// 送货时间 - /// - public string PostDatatime { get; set; } - /// - /// 贴数 - /// - public string UseCount { get; set; } - /// - /// 病人性别 - /// - public string PatientSex { get; set; } - /// - /// 病人姓名 - /// - public string PatientName { get; set; } - /// - /// 医生姓名 - /// - public string DoctorName { get; set; } - /// - /// 诊断 - /// - public string Diagnosis { get; set; } - /// - /// 用法 - /// - public string Usage { get; set; } - /// - /// 治疗号 - /// - public string Zlh { get; set; } - /// - /// 收费序号 - /// - public int Sfxh { get; set; } - /// - /// 收费费用序号 - /// - public string Sffyxh { get; set; } - /// - /// 代煎药厂商代码 - /// - public string CompanyCode { get; set; } - /// - /// 代煎药厂商名称 - /// - public string CompanyName { get; set; } - } - /// - /// HIS发送处方信息应答 - /// - public class HisPrescriptionResult - { - /// - /// 返回结果代码 - /// - public ResultCode Code { get; set; } - /// - /// 返回信息。如执行错误包含错误信息 - /// - public string Msg { get; set; } - /// - /// 处方流水号，执行错误为空 - /// - public string PrescriptionId { get; set; } - } - /// - /// HIS发送的药品信息 - /// - public class HisDrugInfo - { - /// - /// 处方流水号 - /// - public string PrescriptionId { get; set; } - /// - /// "药品医保代码":"YP0306401000650", - /// - public string DrugNo { get; set; } - /// - /// 药品单价 0.085 - /// - public string Price { get; set; } - /// - /// 单贴数量 - /// - public string Count { get; set; } - /// - /// 单位 克 - /// - public string Unit { get; set; } - /// - /// 单项总价 - /// - public string Sum { get; set; } - /// - /// 规格 15.00000000 - /// - public string DrugType { get; set; } - /// - /// 药品编码 - /// - public string DrugLocalNo { get; set; } - /// - /// 药品名称 - /// - public string DrugName { get; set; } - /// - /// 特殊要求 - /// - public string Remark { get; set; } - } - /// - /// HIS发送的药品信息应答 - /// - public class HisDrugResult - { - /// - /// 返回结果代码 - /// - public ResultCode Code { get; set; } - /// - /// 返回信息。如执行错误包含错误信息 - /// - public string Msg { get; set; } - /// - /// 药品流水号，执行错误为空 - /// - public string DrugId { get; set; } - } - /// - /// 处方类型 - /// - [Flags] - public enum PrescriptionType - { - /// - /// 订单 - /// - Order = 1, - /// - /// 撤销订单，退单 - /// - CancelOrder = 2, - /// - /// 测试方。测试处方不会发送给第三方 - /// - TestOrder = 4, - } - - /// - /// 接口执行结果 - /// - [Flags] - public enum ResultCode - { - /// - /// 执行成功。 - /// - Success = 1, - /// - /// 发生异常 - /// - Exception = 2, - } } diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/CmdjyHisFront.csproj b/WebSiteCode/Cmdjy/CmdjyHisFront/CmdjyHisFront.csproj index 6fc496d..04ce6de 100644 --- a/WebSiteCode/Cmdjy/CmdjyHisFront/CmdjyHisFront.csproj +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/CmdjyHisFront.csproj @@ -64,6 +64,8 @@ + + @@ -163,9 +165,17 @@ + + True + True + Reference.svcmap + + + + Global.asax @@ -175,6 +185,19 @@ + + Reference.svcmap + + + Reference.svcmap + + + + + + WCF Proxy Generator + Reference.cs + @@ -188,6 +211,7 @@ PreserveNewest + @@ -229,6 +253,18 @@ + + + {d0fe758c-da33-45c7-8110-563056a58717} + HisInterfaceModels + + + + + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostDrugInfoResponse.datasource b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/CmdjyHisFront.HisServer.PostDrugResponse.datasource similarity index 53% rename from WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostDrugInfoResponse.datasource rename to WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/CmdjyHisFront.HisServer.PostDrugResponse.datasource index 1f6997f..162b837 100644 --- a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostDrugInfoResponse.datasource +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/CmdjyHisFront.HisServer.PostDrugResponse.datasource @@ -5,6 +5,6 @@ Renaming the file extension or editing the content of this file may cause the file to be unrecognizable by the program. --> - - CmdjyTests.HisServices.PostDrugInfoResponse, Connected Services.HisServices.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + CmdjyHisFront.HisServer.PostDrugResponse, Connected Services.HisServer.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostPrescriptionInfoResponse.datasource b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/CmdjyHisFront.HisServer.PostPrescriptionResponse.datasource similarity index 52% rename from WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostPrescriptionInfoResponse.datasource rename to WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/CmdjyHisFront.HisServer.PostPrescriptionResponse.datasource index c70b9c6..8f9fd71 100644 --- a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostPrescriptionInfoResponse.datasource +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/CmdjyHisFront.HisServer.PostPrescriptionResponse.datasource @@ -5,6 +5,6 @@ Renaming the file extension or editing the content of this file may cause the file to be unrecognizable by the program. --> - - CmdjyTests.HisServices.PostPrescriptionInfoResponse, Connected Services.HisServices.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + CmdjyHisFront.HisServer.PostPrescriptionResponse, Connected Services.HisServer.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/HisInterface.disco b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/HisInterface.disco new file mode 100644 index 0000000..80f2f18 --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/HisInterface.disco @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/HisInterface.wsdl b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/HisInterface.wsdl new file mode 100644 index 0000000..e8bcf3e --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/HisInterface.wsdl @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 医疗机构上传处方信息 + + + + + 医疗机构上传药品信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/Reference.cs b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/Reference.cs new file mode 100644 index 0000000..e13cda4 --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/Reference.cs @@ -0,0 +1,246 @@ +//------------------------------------------------------------------------------ +// +// 此代码由工具生成。 +// 运行时版本:4.0.30319.42000 +// +// 对此文件的更改可能会导致不正确的行为，并且如果 +// 重新生成代码，这些更改将会丢失。 +// +//------------------------------------------------------------------------------ + +namespace CmdjyHisFront.HisServer { + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ServiceModel.ServiceContractAttribute(Namespace="http://djy.wondersgroup.com/", ConfigurationName="HisServer.HisInterfaceSoap")] + public interface HisInterfaceSoap { + + // CODEGEN: 命名空间 http://djy.wondersgroup.com/ 的元素名称 msg 以后生成的消息协定未标记为 nillable + [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostPrescription", ReplyAction="*")] + CmdjyHisFront.HisServer.PostPrescriptionResponse PostPrescription(CmdjyHisFront.HisServer.PostPrescriptionRequest request); + + [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostPrescription", ReplyAction="*")] + System.Threading.Tasks.Task PostPrescriptionAsync(CmdjyHisFront.HisServer.PostPrescriptionRequest request); + + // CODEGEN: 命名空间 http://djy.wondersgroup.com/ 的元素名称 msg 以后生成的消息协定未标记为 nillable + [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostDrug", ReplyAction="*")] + CmdjyHisFront.HisServer.PostDrugResponse PostDrug(CmdjyHisFront.HisServer.PostDrugRequest request); + + [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostDrug", ReplyAction="*")] + System.Threading.Tasks.Task PostDrugAsync(CmdjyHisFront.HisServer.PostDrugRequest request); + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] + public partial class PostPrescriptionRequest { + + [System.ServiceModel.MessageBodyMemberAttribute(Name="PostPrescription", Namespace="http://djy.wondersgroup.com/", Order=0)] + public CmdjyHisFront.HisServer.PostPrescriptionRequestBody Body; + + public PostPrescriptionRequest() { + } + + public PostPrescriptionRequest(CmdjyHisFront.HisServer.PostPrescriptionRequestBody Body) { + this.Body = Body; + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + [System.Runtime.Serialization.DataContractAttribute(Namespace="http://djy.wondersgroup.com/")] + public partial class PostPrescriptionRequestBody { + + [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)] + public string msg; + + public PostPrescriptionRequestBody() { + } + + public PostPrescriptionRequestBody(string msg) { + this.msg = msg; + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] + public partial class PostPrescriptionResponse { + + [System.ServiceModel.MessageBodyMemberAttribute(Name="PostPrescriptionResponse", Namespace="http://djy.wondersgroup.com/", Order=0)] + public CmdjyHisFront.HisServer.PostPrescriptionResponseBody Body; + + public PostPrescriptionResponse() { + } + + public PostPrescriptionResponse(CmdjyHisFront.HisServer.PostPrescriptionResponseBody Body) { + this.Body = Body; + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + [System.Runtime.Serialization.DataContractAttribute(Namespace="http://djy.wondersgroup.com/")] + public partial class PostPrescriptionResponseBody { + + [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)] + public string PostPrescriptionResult; + + public PostPrescriptionResponseBody() { + } + + public PostPrescriptionResponseBody(string PostPrescriptionResult) { + this.PostPrescriptionResult = PostPrescriptionResult; + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] + public partial class PostDrugRequest { + + [System.ServiceModel.MessageBodyMemberAttribute(Name="PostDrug", Namespace="http://djy.wondersgroup.com/", Order=0)] + public CmdjyHisFront.HisServer.PostDrugRequestBody Body; + + public PostDrugRequest() { + } + + public PostDrugRequest(CmdjyHisFront.HisServer.PostDrugRequestBody Body) { + this.Body = Body; + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + [System.Runtime.Serialization.DataContractAttribute(Namespace="http://djy.wondersgroup.com/")] + public partial class PostDrugRequestBody { + + [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)] + public string msg; + + public PostDrugRequestBody() { + } + + public PostDrugRequestBody(string msg) { + this.msg = msg; + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] + public partial class PostDrugResponse { + + [System.ServiceModel.MessageBodyMemberAttribute(Name="PostDrugResponse", Namespace="http://djy.wondersgroup.com/", Order=0)] + public CmdjyHisFront.HisServer.PostDrugResponseBody Body; + + public PostDrugResponse() { + } + + public PostDrugResponse(CmdjyHisFront.HisServer.PostDrugResponseBody Body) { + this.Body = Body; + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + [System.Runtime.Serialization.DataContractAttribute(Namespace="http://djy.wondersgroup.com/")] + public partial class PostDrugResponseBody { + + [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)] + public string PostDrugResult; + + public PostDrugResponseBody() { + } + + public PostDrugResponseBody(string PostDrugResult) { + this.PostDrugResult = PostDrugResult; + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + public interface HisInterfaceSoapChannel : CmdjyHisFront.HisServer.HisInterfaceSoap, System.ServiceModel.IClientChannel { + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] + public partial class HisInterfaceSoapClient : System.ServiceModel.ClientBase, CmdjyHisFront.HisServer.HisInterfaceSoap { + + public HisInterfaceSoapClient() { + } + + public HisInterfaceSoapClient(string endpointConfigurationName) : + base(endpointConfigurationName) { + } + + public HisInterfaceSoapClient(string endpointConfigurationName, string remoteAddress) : + base(endpointConfigurationName, remoteAddress) { + } + + public HisInterfaceSoapClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) : + base(endpointConfigurationName, remoteAddress) { + } + + public HisInterfaceSoapClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(binding, remoteAddress) { + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + CmdjyHisFront.HisServer.PostPrescriptionResponse CmdjyHisFront.HisServer.HisInterfaceSoap.PostPrescription(CmdjyHisFront.HisServer.PostPrescriptionRequest request) { + return base.Channel.PostPrescription(request); + } + + public string PostPrescription(string msg) { + CmdjyHisFront.HisServer.PostPrescriptionRequest inValue = new CmdjyHisFront.HisServer.PostPrescriptionRequest(); + inValue.Body = new CmdjyHisFront.HisServer.PostPrescriptionRequestBody(); + inValue.Body.msg = msg; + CmdjyHisFront.HisServer.PostPrescriptionResponse retVal = ((CmdjyHisFront.HisServer.HisInterfaceSoap)(this)).PostPrescription(inValue); + return retVal.Body.PostPrescriptionResult; + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + System.Threading.Tasks.Task CmdjyHisFront.HisServer.HisInterfaceSoap.PostPrescriptionAsync(CmdjyHisFront.HisServer.PostPrescriptionRequest request) { + return base.Channel.PostPrescriptionAsync(request); + } + + public System.Threading.Tasks.Task PostPrescriptionAsync(string msg) { + CmdjyHisFront.HisServer.PostPrescriptionRequest inValue = new CmdjyHisFront.HisServer.PostPrescriptionRequest(); + inValue.Body = new CmdjyHisFront.HisServer.PostPrescriptionRequestBody(); + inValue.Body.msg = msg; + return ((CmdjyHisFront.HisServer.HisInterfaceSoap)(this)).PostPrescriptionAsync(inValue); + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + CmdjyHisFront.HisServer.PostDrugResponse CmdjyHisFront.HisServer.HisInterfaceSoap.PostDrug(CmdjyHisFront.HisServer.PostDrugRequest request) { + return base.Channel.PostDrug(request); + } + + public string PostDrug(string msg) { + CmdjyHisFront.HisServer.PostDrugRequest inValue = new CmdjyHisFront.HisServer.PostDrugRequest(); + inValue.Body = new CmdjyHisFront.HisServer.PostDrugRequestBody(); + inValue.Body.msg = msg; + CmdjyHisFront.HisServer.PostDrugResponse retVal = ((CmdjyHisFront.HisServer.HisInterfaceSoap)(this)).PostDrug(inValue); + return retVal.Body.PostDrugResult; + } + + [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] + System.Threading.Tasks.Task CmdjyHisFront.HisServer.HisInterfaceSoap.PostDrugAsync(CmdjyHisFront.HisServer.PostDrugRequest request) { + return base.Channel.PostDrugAsync(request); + } + + public System.Threading.Tasks.Task PostDrugAsync(string msg) { + CmdjyHisFront.HisServer.PostDrugRequest inValue = new CmdjyHisFront.HisServer.PostDrugRequest(); + inValue.Body = new CmdjyHisFront.HisServer.PostDrugRequestBody(); + inValue.Body.msg = msg; + return ((CmdjyHisFront.HisServer.HisInterfaceSoap)(this)).PostDrugAsync(inValue); + } + } +} diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/Reference.svcmap b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/Reference.svcmap new file mode 100644 index 0000000..8d1a9c4 --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/Reference.svcmap @@ -0,0 +1,32 @@ + + + + false + true + true + + false + false + false + + + true + Auto + true + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/configuration.svcinfo b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/configuration.svcinfo new file mode 100644 index 0000000..b8113c7 --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/configuration.svcinfo @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/configuration91.svcinfo b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/configuration91.svcinfo new file mode 100644 index 0000000..4aa607e --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Connected Services/HisServer/configuration91.svcinfo @@ -0,0 +1,201 @@ + + + + + + + HisInterfaceSoap + + + + + + + + + + + + + + + + + + + + + StrongWildcard + + + + + + 65536 + + + + + + + + + System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + System.Text.UTF8Encoding + + + Buffered + + + + + + Text + + + System.ServiceModel.Configuration.BasicHttpSecurityElement + + + None + + + System.ServiceModel.Configuration.HttpTransportSecurityElement + + + None + + + None + + + System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement + + + Never + + + TransportSelected + + + (集合) + + + + + + System.ServiceModel.Configuration.BasicHttpMessageSecurityElement + + + UserName + + + Default + + + + + + + + + http://localhost:22888/ws/HisInterface.asmx + + + + + + basicHttpBinding + + + HisInterfaceSoap + + + HisServer.HisInterfaceSoap + + + System.ServiceModel.Configuration.AddressHeaderCollectionElement + + + <Header /> + + + System.ServiceModel.Configuration.IdentityElement + + + System.ServiceModel.Configuration.UserPrincipalNameElement + + + + + + System.ServiceModel.Configuration.ServicePrincipalNameElement + + + + + + System.ServiceModel.Configuration.DnsElement + + + + + + System.ServiceModel.Configuration.RsaElement + + + + + + System.ServiceModel.Configuration.CertificateElement + + + + + + System.ServiceModel.Configuration.CertificateReferenceElement + + + My + + + LocalMachine + + + FindBySubjectDistinguishedName + + + + + + False + + + HisInterfaceSoap + + + + + + + + + + + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/HisFrontDbContext.cs b/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/HisFrontDbContext.cs index e6039f1..b6016be 100644 --- a/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/HisFrontDbContext.cs +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/HisFrontDbContext.cs @@ -1,4 +1,5 @@ using System.Data.Entity; +using CmdjyHisFront.Dal.Tables; namespace CmdjyHisFront.Dal { @@ -11,4 +12,17 @@ namespace CmdjyHisFront.Dal this.Database.CreateIfNotExists(); } } + + partial class HisFrontDbContext + { + /// + /// 处方信息 + /// + public DbSet PrescriptionInfo { get; set; } + /// + /// 药品信息 + /// + public DbSet DrugInfo { get; set; } + + } } \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/HisDrugInfo.cs b/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/HisDrugInfo.cs new file mode 100644 index 0000000..37a354d --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/HisDrugInfo.cs @@ -0,0 +1,67 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace CmdjyHisFront.Dal.Tables +{ + /// + /// HIS发送的药品信息 + /// + [Table("HisDrugInfo")] + public class HisDrugInfo + { + /// + /// 主键，药品流水号 + /// + [Key] + public int Id { get; set; } + /// + /// 记录创建时间 + /// + public DateTime CreateDatetime { get; set; } + /// + /// 处方流水号 + /// + public int PrescriptionId { get; set; } + /// + /// 发送请求的原始IP地址 + /// + public string RawAddress { get; set; } + /// + /// "药品医保代码":"YP0306401000650", + /// + public string DrugNo { get; set; } + /// + /// 药品单价 0.085 + /// + public string Price { get; set; } + /// + /// 单贴数量 + /// + public string Count { get; set; } + /// + /// 单位 克 + /// + public string Unit { get; set; } + /// + /// 单项总价 + /// + public string Sum { get; set; } + /// + /// 规格 15.00000000 + /// + public string DrugType { get; set; } + /// + /// 药品编码 + /// + public string DrugLocalNo { get; set; } + /// + /// 药品名称 + /// + public string DrugName { get; set; } + /// + /// 特殊要求 + /// + public string Remark { get; set; } + } +} \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/HisPrescriptionInfo.cs b/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/HisPrescriptionInfo.cs new file mode 100644 index 0000000..df2b0c4 --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/HisPrescriptionInfo.cs @@ -0,0 +1,191 @@ +using System; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace CmdjyHisFront.Dal.Tables +{ + /// + /// HIS发送的处方信息 + /// + [Table("HisPrescriptionInfo")] + public class HisPrescriptionInfo + { + /// + /// 主键，处方流水号 + /// + [Key] + public int Id { get; set; } + /// + /// 记录创建时间 + /// + public DateTime CreateDatetime { get; set; } + /// + /// 发送请求的原始IP地址 + /// + public string RawAddress { get; set; } + /// + /// 处方类型 + /// + public PrescriptionType Type { get; set; } + /// + /// 如果为退方，这里传要退的处方流水号。此编号在下单应答消息中提供 + /// + public string RawRecordId { get; set; } + /// + /// 药品明细数量 + /// + public string DrugCount { get; set; } + /// + /// 处方备注 + /// + public string Remark { get; set; } + /// + /// 带回病房 否 + /// + public string TakeBack { get; set; } + /// + /// "操作类型": "煎药自取", or "操作类型": "煎药快递", or "操作类型": "配药快递" + /// + public string OpType { get; set; } + /// + /// 操作员 + /// + public string OpUser { get; set; } + /// + /// 病区 + /// + public string Area { get; set; } + /// + /// 病床号 + /// + public string Bed { get; set; } + /// + /// 操作时间 + /// + public string OpDatatime { get; set; } + /// + /// 处方号 + /// + public string PrescriptionNo { get; set; } + /// + /// 处方日期 + /// + public string PrescriptionDatatime { get; set; } + /// + /// 单位编号 医疗机构编号 + /// + public string HosNo { get; set; } + /// + /// 医疗机构名称 + /// + public string HosName { get; set; } + /// + /// 发票号 + /// + public string InvoiceNo { get; set; } + /// + /// 病人编号 + /// + public string PatientNo { get; set; } + /// + /// 病人卡号 + /// + public string CardNo { get; set; } + /// + /// 科室名称 + /// + public string DepName { get; set; } + /// + /// 病人年龄 + /// + public string PatientAge { get; set; } + /// + /// 病人生日 + /// + public string PatientBrithday { get; set; } + /// + /// 病人手机号码 + /// + public string PatientMobile { get; set; } + /// + /// 病人电话 + /// + public string PatientPhone { get; set; } + /// + /// 所在区县街道 + /// + public string District { get; set; } + /// + /// 送货地址 + /// + public string PostAddress { get; set; } + /// + /// 送货时间 + /// + public string PostDatatime { get; set; } + /// + /// 贴数 + /// + public string UseCount { get; set; } + /// + /// 病人性别 + /// + public string PatientSex { get; set; } + /// + /// 病人姓名 + /// + public string PatientName { get; set; } + /// + /// 医生姓名 + /// + public string DoctorName { get; set; } + /// + /// 诊断 + /// + public string Diagnosis { get; set; } + /// + /// 用法 + /// + public string Usage { get; set; } + /// + /// 治疗号 + /// + public string Zlh { get; set; } + /// + /// 收费序号 + /// + public int Sfxh { get; set; } + /// + /// 收费费用序号 + /// + public string Sffyxh { get; set; } + /// + /// 代煎药厂商代码 + /// + public string CompanyCode { get; set; } + /// + /// 代煎药厂商名称 + /// + public string CompanyName { get; set; } + } + + /// + /// 处方类型 + /// + [Flags] + public enum PrescriptionType + { + /// + /// 订单 + /// + Order = 1, + /// + /// 撤销订单，退单 + /// + CancelOrder = 2, + /// + /// 测试方。测试处方不会发送给第三方 + /// + TestOrder = 4, + } +} \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/PostLog.cs b/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/PostLog.cs new file mode 100644 index 0000000..60c1981 --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Dal/Tables/PostLog.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; + +namespace CmdjyHisFront.Dal.Tables +{ + /// + /// 上传记录表 + /// + public class PostLog + { + /// + /// + /// + public int Id { get; set; } + /// + /// + /// + public int HisPrescriptionInfoId { get; set; } + /// + /// + /// + public int ResultCode { get; set; } + /// + /// + /// + /// + /// + /// + public string ResultMsg { get; set; } + /// + /// + /// + public int PrescriptionId { get; set; } + /// + /// + /// + public DateTime PostDatatime { get; set; } + } +} \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/Web.config b/WebSiteCode/Cmdjy/CmdjyHisFront/Web.config index 8f50f4a..3029a4a 100644 --- a/WebSiteCode/Cmdjy/CmdjyHisFront/Web.config +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/Web.config @@ -89,4 +89,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyHisFront/WebSettings.cs b/WebSiteCode/Cmdjy/CmdjyHisFront/WebSettings.cs index c35962f..ae4ec8b 100644 --- a/WebSiteCode/Cmdjy/CmdjyHisFront/WebSettings.cs +++ b/WebSiteCode/Cmdjy/CmdjyHisFront/WebSettings.cs @@ -23,7 +23,7 @@ namespace CmdjyHisFront if(bool.TryParse(val,out bool v)) { return v; } - return true; + return false; } } } diff --git a/WebSiteCode/Cmdjy/CmdjyTests/CmdjyTests.csproj b/WebSiteCode/Cmdjy/CmdjyTests/CmdjyTests.csproj index 4b66382..37e9e93 100644 --- a/WebSiteCode/Cmdjy/CmdjyTests/CmdjyTests.csproj +++ b/WebSiteCode/Cmdjy/CmdjyTests/CmdjyTests.csproj @@ -84,13 +84,17 @@ {03F35833-1CF9-42BC-BF51-444F7181A967} Cmdjy + + {d0fe758c-da33-45c7-8110-563056a58717} + HisInterfaceModels + - + Reference.svcmap - + Reference.svcmap diff --git a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostDrugResponse.datasource b/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostDrugResponse.datasource new file mode 100644 index 0000000..f04e2bd --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostDrugResponse.datasource @@ -0,0 +1,10 @@ + + + + CmdjyTests.HisServices.PostDrugResponse, Connected Services.HisServices.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostPrescriptionResponse.datasource b/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostPrescriptionResponse.datasource new file mode 100644 index 0000000..f52d235 --- /dev/null +++ b/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/CmdjyTests.HisServices.PostPrescriptionResponse.datasource @@ -0,0 +1,10 @@ + + + + CmdjyTests.HisServices.PostPrescriptionResponse, Connected Services.HisServices.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/HisInterface.wsdl b/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/HisInterface.wsdl index 5e534f5..e8bcf3e 100644 --- a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/HisInterface.wsdl +++ b/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/HisInterface.wsdl @@ -2,129 +2,64 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - - - - - - - - - - - - - + - + - - + + - - + + - - + + - - + + - + 医疗机构上传处方信息 - - + + - + 医疗机构上传药品信息 - - + + - - + + @@ -132,8 +67,8 @@ - - + + @@ -144,8 +79,8 @@ - - + + @@ -153,8 +88,8 @@ - - + + diff --git a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/Reference.cs b/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/Reference.cs index a465a24..ffb3af7 100644 --- a/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/Reference.cs +++ b/WebSiteCode/Cmdjy/CmdjyTests/Connected Services/HisServices/Reference.cs @@ -9,849 +9,40 @@ //------------------------------------------------------------------------------ namespace CmdjyTests.HisServices { - using System.Runtime.Serialization; - using System; - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="HisPrescriptionInfo", Namespace="http://djy.wondersgroup.com/")] - [System.SerializableAttribute()] - public partial class HisPrescriptionInfo : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - private CmdjyTests.HisServices.PrescriptionType TypeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string RawRecordIdField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DrugCountField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string RemarkField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string TakeBackField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string OpTypeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string OpUserField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string AreaField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string BedField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string OpDatatimeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PrescriptionNoField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PrescriptionDatatimeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string HosNoField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string HosNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string InvoiceNoField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PatientNoField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string CardNoField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DepNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PatientAgeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PatientBrithdayField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PatientMobileField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PatientPhoneField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DistrictField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PostAddressField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PostDatatimeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string UseCountField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PatientSexField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PatientNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DoctorNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DiagnosisField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string UsageField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string ZlhField; - - private int SfxhField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string SffyxhField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string CompanyCodeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string CompanyNameField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true)] - public CmdjyTests.HisServices.PrescriptionType Type { - get { - return this.TypeField; - } - set { - if ((this.TypeField.Equals(value) != true)) { - this.TypeField = value; - this.RaisePropertyChanged("Type"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=1)] - public string RawRecordId { - get { - return this.RawRecordIdField; - } - set { - if ((object.ReferenceEquals(this.RawRecordIdField, value) != true)) { - this.RawRecordIdField = value; - this.RaisePropertyChanged("RawRecordId"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=2)] - public string DrugCount { - get { - return this.DrugCountField; - } - set { - if ((object.ReferenceEquals(this.DrugCountField, value) != true)) { - this.DrugCountField = value; - this.RaisePropertyChanged("DrugCount"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=3)] - public string Remark { - get { - return this.RemarkField; - } - set { - if ((object.ReferenceEquals(this.RemarkField, value) != true)) { - this.RemarkField = value; - this.RaisePropertyChanged("Remark"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=4)] - public string TakeBack { - get { - return this.TakeBackField; - } - set { - if ((object.ReferenceEquals(this.TakeBackField, value) != true)) { - this.TakeBackField = value; - this.RaisePropertyChanged("TakeBack"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=5)] - public string OpType { - get { - return this.OpTypeField; - } - set { - if ((object.ReferenceEquals(this.OpTypeField, value) != true)) { - this.OpTypeField = value; - this.RaisePropertyChanged("OpType"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=6)] - public string OpUser { - get { - return this.OpUserField; - } - set { - if ((object.ReferenceEquals(this.OpUserField, value) != true)) { - this.OpUserField = value; - this.RaisePropertyChanged("OpUser"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=7)] - public string Area { - get { - return this.AreaField; - } - set { - if ((object.ReferenceEquals(this.AreaField, value) != true)) { - this.AreaField = value; - this.RaisePropertyChanged("Area"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=8)] - public string Bed { - get { - return this.BedField; - } - set { - if ((object.ReferenceEquals(this.BedField, value) != true)) { - this.BedField = value; - this.RaisePropertyChanged("Bed"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=9)] - public string OpDatatime { - get { - return this.OpDatatimeField; - } - set { - if ((object.ReferenceEquals(this.OpDatatimeField, value) != true)) { - this.OpDatatimeField = value; - this.RaisePropertyChanged("OpDatatime"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=10)] - public string PrescriptionNo { - get { - return this.PrescriptionNoField; - } - set { - if ((object.ReferenceEquals(this.PrescriptionNoField, value) != true)) { - this.PrescriptionNoField = value; - this.RaisePropertyChanged("PrescriptionNo"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=11)] - public string PrescriptionDatatime { - get { - return this.PrescriptionDatatimeField; - } - set { - if ((object.ReferenceEquals(this.PrescriptionDatatimeField, value) != true)) { - this.PrescriptionDatatimeField = value; - this.RaisePropertyChanged("PrescriptionDatatime"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=12)] - public string HosNo { - get { - return this.HosNoField; - } - set { - if ((object.ReferenceEquals(this.HosNoField, value) != true)) { - this.HosNoField = value; - this.RaisePropertyChanged("HosNo"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=13)] - public string HosName { - get { - return this.HosNameField; - } - set { - if ((object.ReferenceEquals(this.HosNameField, value) != true)) { - this.HosNameField = value; - this.RaisePropertyChanged("HosName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=14)] - public string InvoiceNo { - get { - return this.InvoiceNoField; - } - set { - if ((object.ReferenceEquals(this.InvoiceNoField, value) != true)) { - this.InvoiceNoField = value; - this.RaisePropertyChanged("InvoiceNo"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=15)] - public string PatientNo { - get { - return this.PatientNoField; - } - set { - if ((object.ReferenceEquals(this.PatientNoField, value) != true)) { - this.PatientNoField = value; - this.RaisePropertyChanged("PatientNo"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=16)] - public string CardNo { - get { - return this.CardNoField; - } - set { - if ((object.ReferenceEquals(this.CardNoField, value) != true)) { - this.CardNoField = value; - this.RaisePropertyChanged("CardNo"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=17)] - public string DepName { - get { - return this.DepNameField; - } - set { - if ((object.ReferenceEquals(this.DepNameField, value) != true)) { - this.DepNameField = value; - this.RaisePropertyChanged("DepName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=18)] - public string PatientAge { - get { - return this.PatientAgeField; - } - set { - if ((object.ReferenceEquals(this.PatientAgeField, value) != true)) { - this.PatientAgeField = value; - this.RaisePropertyChanged("PatientAge"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=19)] - public string PatientBrithday { - get { - return this.PatientBrithdayField; - } - set { - if ((object.ReferenceEquals(this.PatientBrithdayField, value) != true)) { - this.PatientBrithdayField = value; - this.RaisePropertyChanged("PatientBrithday"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=20)] - public string PatientMobile { - get { - return this.PatientMobileField; - } - set { - if ((object.ReferenceEquals(this.PatientMobileField, value) != true)) { - this.PatientMobileField = value; - this.RaisePropertyChanged("PatientMobile"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=21)] - public string PatientPhone { - get { - return this.PatientPhoneField; - } - set { - if ((object.ReferenceEquals(this.PatientPhoneField, value) != true)) { - this.PatientPhoneField = value; - this.RaisePropertyChanged("PatientPhone"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=22)] - public string District { - get { - return this.DistrictField; - } - set { - if ((object.ReferenceEquals(this.DistrictField, value) != true)) { - this.DistrictField = value; - this.RaisePropertyChanged("District"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=23)] - public string PostAddress { - get { - return this.PostAddressField; - } - set { - if ((object.ReferenceEquals(this.PostAddressField, value) != true)) { - this.PostAddressField = value; - this.RaisePropertyChanged("PostAddress"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=24)] - public string PostDatatime { - get { - return this.PostDatatimeField; - } - set { - if ((object.ReferenceEquals(this.PostDatatimeField, value) != true)) { - this.PostDatatimeField = value; - this.RaisePropertyChanged("PostDatatime"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=25)] - public string UseCount { - get { - return this.UseCountField; - } - set { - if ((object.ReferenceEquals(this.UseCountField, value) != true)) { - this.UseCountField = value; - this.RaisePropertyChanged("UseCount"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=26)] - public string PatientSex { - get { - return this.PatientSexField; - } - set { - if ((object.ReferenceEquals(this.PatientSexField, value) != true)) { - this.PatientSexField = value; - this.RaisePropertyChanged("PatientSex"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=27)] - public string PatientName { - get { - return this.PatientNameField; - } - set { - if ((object.ReferenceEquals(this.PatientNameField, value) != true)) { - this.PatientNameField = value; - this.RaisePropertyChanged("PatientName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=28)] - public string DoctorName { - get { - return this.DoctorNameField; - } - set { - if ((object.ReferenceEquals(this.DoctorNameField, value) != true)) { - this.DoctorNameField = value; - this.RaisePropertyChanged("DoctorName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=29)] - public string Diagnosis { - get { - return this.DiagnosisField; - } - set { - if ((object.ReferenceEquals(this.DiagnosisField, value) != true)) { - this.DiagnosisField = value; - this.RaisePropertyChanged("Diagnosis"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=30)] - public string Usage { - get { - return this.UsageField; - } - set { - if ((object.ReferenceEquals(this.UsageField, value) != true)) { - this.UsageField = value; - this.RaisePropertyChanged("Usage"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=31)] - public string Zlh { - get { - return this.ZlhField; - } - set { - if ((object.ReferenceEquals(this.ZlhField, value) != true)) { - this.ZlhField = value; - this.RaisePropertyChanged("Zlh"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(IsRequired=true, Order=32)] - public int Sfxh { - get { - return this.SfxhField; - } - set { - if ((this.SfxhField.Equals(value) != true)) { - this.SfxhField = value; - this.RaisePropertyChanged("Sfxh"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=33)] - public string Sffyxh { - get { - return this.SffyxhField; - } - set { - if ((object.ReferenceEquals(this.SffyxhField, value) != true)) { - this.SffyxhField = value; - this.RaisePropertyChanged("Sffyxh"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=34)] - public string CompanyCode { - get { - return this.CompanyCodeField; - } - set { - if ((object.ReferenceEquals(this.CompanyCodeField, value) != true)) { - this.CompanyCodeField = value; - this.RaisePropertyChanged("CompanyCode"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=35)] - public string CompanyName { - get { - return this.CompanyNameField; - } - set { - if ((object.ReferenceEquals(this.CompanyNameField, value) != true)) { - this.CompanyNameField = value; - this.RaisePropertyChanged("CompanyName"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.FlagsAttribute()] - [System.Runtime.Serialization.DataContractAttribute(Name="PrescriptionType", Namespace="http://djy.wondersgroup.com/")] - public enum PrescriptionType : int { - - [System.Runtime.Serialization.EnumMemberAttribute()] - Order = 1, - - [System.Runtime.Serialization.EnumMemberAttribute()] - CancelOrder = 2, - - [System.Runtime.Serialization.EnumMemberAttribute()] - TestOrder = 4, - } - - [System.Diagnostics.DebuggerStepThroughAttribute()] - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")] - [System.Runtime.Serialization.DataContractAttribute(Name="HisDrugInfo", Namespace="http://djy.wondersgroup.com/")] - [System.SerializableAttribute()] - public partial class HisDrugInfo : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged { - - [System.NonSerializedAttribute()] - private System.Runtime.Serialization.ExtensionDataObject extensionDataField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PrescriptionIdField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DrugNoField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string PriceField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string CountField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string UnitField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string SumField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DrugTypeField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DrugLocalNoField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string DrugNameField; - - [System.Runtime.Serialization.OptionalFieldAttribute()] - private string RemarkField; - - [global::System.ComponentModel.BrowsableAttribute(false)] - public System.Runtime.Serialization.ExtensionDataObject ExtensionData { - get { - return this.extensionDataField; - } - set { - this.extensionDataField = value; - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false)] - public string PrescriptionId { - get { - return this.PrescriptionIdField; - } - set { - if ((object.ReferenceEquals(this.PrescriptionIdField, value) != true)) { - this.PrescriptionIdField = value; - this.RaisePropertyChanged("PrescriptionId"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=1)] - public string DrugNo { - get { - return this.DrugNoField; - } - set { - if ((object.ReferenceEquals(this.DrugNoField, value) != true)) { - this.DrugNoField = value; - this.RaisePropertyChanged("DrugNo"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=2)] - public string Price { - get { - return this.PriceField; - } - set { - if ((object.ReferenceEquals(this.PriceField, value) != true)) { - this.PriceField = value; - this.RaisePropertyChanged("Price"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=3)] - public string Count { - get { - return this.CountField; - } - set { - if ((object.ReferenceEquals(this.CountField, value) != true)) { - this.CountField = value; - this.RaisePropertyChanged("Count"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=4)] - public string Unit { - get { - return this.UnitField; - } - set { - if ((object.ReferenceEquals(this.UnitField, value) != true)) { - this.UnitField = value; - this.RaisePropertyChanged("Unit"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=5)] - public string Sum { - get { - return this.SumField; - } - set { - if ((object.ReferenceEquals(this.SumField, value) != true)) { - this.SumField = value; - this.RaisePropertyChanged("Sum"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=6)] - public string DrugType { - get { - return this.DrugTypeField; - } - set { - if ((object.ReferenceEquals(this.DrugTypeField, value) != true)) { - this.DrugTypeField = value; - this.RaisePropertyChanged("DrugType"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=7)] - public string DrugLocalNo { - get { - return this.DrugLocalNoField; - } - set { - if ((object.ReferenceEquals(this.DrugLocalNoField, value) != true)) { - this.DrugLocalNoField = value; - this.RaisePropertyChanged("DrugLocalNo"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=8)] - public string DrugName { - get { - return this.DrugNameField; - } - set { - if ((object.ReferenceEquals(this.DrugNameField, value) != true)) { - this.DrugNameField = value; - this.RaisePropertyChanged("DrugName"); - } - } - } - - [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=9)] - public string Remark { - get { - return this.RemarkField; - } - set { - if ((object.ReferenceEquals(this.RemarkField, value) != true)) { - this.RemarkField = value; - this.RaisePropertyChanged("Remark"); - } - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; - - protected void RaisePropertyChanged(string propertyName) { - System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged; - if ((propertyChanged != null)) { - propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - } - [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ServiceModel.ServiceContractAttribute(Namespace="http://djy.wondersgroup.com/", ConfigurationName="HisServices.HisInterfaceSoap")] public interface HisInterfaceSoap { - // CODEGEN: 命名空间 http://djy.wondersgroup.com/ 的元素名称 info 以后生成的消息协定未标记为 nillable - [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostPrescriptionInfo", ReplyAction="*")] - CmdjyTests.HisServices.PostPrescriptionInfoResponse PostPrescriptionInfo(CmdjyTests.HisServices.PostPrescriptionInfoRequest request); + // CODEGEN: 命名空间 http://djy.wondersgroup.com/ 的元素名称 msg 以后生成的消息协定未标记为 nillable + [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostPrescription", ReplyAction="*")] + CmdjyTests.HisServices.PostPrescriptionResponse PostPrescription(CmdjyTests.HisServices.PostPrescriptionRequest request); - [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostPrescriptionInfo", ReplyAction="*")] - System.Threading.Tasks.Task PostPrescriptionInfoAsync(CmdjyTests.HisServices.PostPrescriptionInfoRequest request); + [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostPrescription", ReplyAction="*")] + System.Threading.Tasks.Task PostPrescriptionAsync(CmdjyTests.HisServices.PostPrescriptionRequest request); - // CODEGEN: 命名空间 http://djy.wondersgroup.com/ 的元素名称 info 以后生成的消息协定未标记为 nillable - [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostDrugInfo", ReplyAction="*")] - CmdjyTests.HisServices.PostDrugInfoResponse PostDrugInfo(CmdjyTests.HisServices.PostDrugInfoRequest request); + // CODEGEN: 命名空间 http://djy.wondersgroup.com/ 的元素名称 msg 以后生成的消息协定未标记为 nillable + [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostDrug", ReplyAction="*")] + CmdjyTests.HisServices.PostDrugResponse PostDrug(CmdjyTests.HisServices.PostDrugRequest request); - [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostDrugInfo", ReplyAction="*")] - System.Threading.Tasks.Task PostDrugInfoAsync(CmdjyTests.HisServices.PostDrugInfoRequest request); + [System.ServiceModel.OperationContractAttribute(Action="http://djy.wondersgroup.com/PostDrug", ReplyAction="*")] + System.Threading.Tasks.Task PostDrugAsync(CmdjyTests.HisServices.PostDrugRequest request); } [System.Diagnostics.DebuggerStepThroughAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] - public partial class PostPrescriptionInfoRequest { + public partial class PostPrescriptionRequest { - [System.ServiceModel.MessageBodyMemberAttribute(Name="PostPrescriptionInfo", Namespace="http://djy.wondersgroup.com/", Order=0)] - public CmdjyTests.HisServices.PostPrescriptionInfoRequestBody Body; + [System.ServiceModel.MessageBodyMemberAttribute(Name="PostPrescription", Namespace="http://djy.wondersgroup.com/", Order=0)] + public CmdjyTests.HisServices.PostPrescriptionRequestBody Body; - public PostPrescriptionInfoRequest() { + public PostPrescriptionRequest() { } - public PostPrescriptionInfoRequest(CmdjyTests.HisServices.PostPrescriptionInfoRequestBody Body) { + public PostPrescriptionRequest(CmdjyTests.HisServices.PostPrescriptionRequestBody Body) { this.Body = Body; } } @@ -860,16 +51,16 @@ namespace CmdjyTests.HisServices { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] [System.Runtime.Serialization.DataContractAttribute(Namespace="http://djy.wondersgroup.com/")] - public partial class PostPrescriptionInfoRequestBody { + public partial class PostPrescriptionRequestBody { [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)] - public CmdjyTests.HisServices.HisPrescriptionInfo info; + public string msg; - public PostPrescriptionInfoRequestBody() { + public PostPrescriptionRequestBody() { } - public PostPrescriptionInfoRequestBody(CmdjyTests.HisServices.HisPrescriptionInfo info) { - this.info = info; + public PostPrescriptionRequestBody(string msg) { + this.msg = msg; } } @@ -877,15 +68,15 @@ namespace CmdjyTests.HisServices { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] - public partial class PostPrescriptionInfoResponse { + public partial class PostPrescriptionResponse { - [System.ServiceModel.MessageBodyMemberAttribute(Name="PostPrescriptionInfoResponse", Namespace="http://djy.wondersgroup.com/", Order=0)] - public CmdjyTests.HisServices.PostPrescriptionInfoResponseBody Body; + [System.ServiceModel.MessageBodyMemberAttribute(Name="PostPrescriptionResponse", Namespace="http://djy.wondersgroup.com/", Order=0)] + public CmdjyTests.HisServices.PostPrescriptionResponseBody Body; - public PostPrescriptionInfoResponse() { + public PostPrescriptionResponse() { } - public PostPrescriptionInfoResponse(CmdjyTests.HisServices.PostPrescriptionInfoResponseBody Body) { + public PostPrescriptionResponse(CmdjyTests.HisServices.PostPrescriptionResponseBody Body) { this.Body = Body; } } @@ -894,16 +85,16 @@ namespace CmdjyTests.HisServices { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] [System.Runtime.Serialization.DataContractAttribute(Namespace="http://djy.wondersgroup.com/")] - public partial class PostPrescriptionInfoResponseBody { + public partial class PostPrescriptionResponseBody { [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)] - public string PostPrescriptionInfoResult; + public string PostPrescriptionResult; - public PostPrescriptionInfoResponseBody() { + public PostPrescriptionResponseBody() { } - public PostPrescriptionInfoResponseBody(string PostPrescriptionInfoResult) { - this.PostPrescriptionInfoResult = PostPrescriptionInfoResult; + public PostPrescriptionResponseBody(string PostPrescriptionResult) { + this.PostPrescriptionResult = PostPrescriptionResult; } } @@ -911,15 +102,15 @@ namespace CmdjyTests.HisServices { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] - public partial class PostDrugInfoRequest { + public partial class PostDrugRequest { - [System.ServiceModel.MessageBodyMemberAttribute(Name="PostDrugInfo", Namespace="http://djy.wondersgroup.com/", Order=0)] - public CmdjyTests.HisServices.PostDrugInfoRequestBody Body; + [System.ServiceModel.MessageBodyMemberAttribute(Name="PostDrug", Namespace="http://djy.wondersgroup.com/", Order=0)] + public CmdjyTests.HisServices.PostDrugRequestBody Body; - public PostDrugInfoRequest() { + public PostDrugRequest() { } - public PostDrugInfoRequest(CmdjyTests.HisServices.PostDrugInfoRequestBody Body) { + public PostDrugRequest(CmdjyTests.HisServices.PostDrugRequestBody Body) { this.Body = Body; } } @@ -928,16 +119,16 @@ namespace CmdjyTests.HisServices { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] [System.Runtime.Serialization.DataContractAttribute(Namespace="http://djy.wondersgroup.com/")] - public partial class PostDrugInfoRequestBody { + public partial class PostDrugRequestBody { [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)] - public CmdjyTests.HisServices.HisDrugInfo info; + public string msg; - public PostDrugInfoRequestBody() { + public PostDrugRequestBody() { } - public PostDrugInfoRequestBody(CmdjyTests.HisServices.HisDrugInfo info) { - this.info = info; + public PostDrugRequestBody(string msg) { + this.msg = msg; } } @@ -945,15 +136,15 @@ namespace CmdjyTests.HisServices { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] [System.ServiceModel.MessageContractAttribute(IsWrapped=false)] - public partial class PostDrugInfoResponse { + public partial class PostDrugResponse { - [System.ServiceModel.MessageBodyMemberAttribute(Name="PostDrugInfoResponse", Namespace="http://djy.wondersgroup.com/", Order=0)] - public CmdjyTests.HisServices.PostDrugInfoResponseBody Body; + [System.ServiceModel.MessageBodyMemberAttribute(Name="PostDrugResponse", Namespace="http://djy.wondersgroup.com/", Order=0)] + public CmdjyTests.HisServices.PostDrugResponseBody Body; - public PostDrugInfoResponse() { + public PostDrugResponse() { } - public PostDrugInfoResponse(CmdjyTests.HisServices.PostDrugInfoResponseBody Body) { + public PostDrugResponse(CmdjyTests.HisServices.PostDrugResponseBody Body) { this.Body = Body; } } @@ -962,16 +153,16 @@ namespace CmdjyTests.HisServices { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] [System.Runtime.Serialization.DataContractAttribute(Namespace="http://djy.wondersgroup.com/")] - public partial class PostDrugInfoResponseBody { + public partial class PostDrugResponseBody { [System.Runtime.Serialization.DataMemberAttribute(EmitDefaultValue=false, Order=0)] - public string PostDrugInfoResult; + public string PostDrugResult; - public PostDrugInfoResponseBody() { + public PostDrugResponseBody() { } - public PostDrugInfoResponseBody(string PostDrugInfoResult) { - this.PostDrugInfoResult = PostDrugInfoResult; + public PostDrugResponseBody(string PostDrugResult) { + this.PostDrugResult = PostDrugResult; } } @@ -1003,53 +194,53 @@ namespace CmdjyTests.HisServices { } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - CmdjyTests.HisServices.PostPrescriptionInfoResponse CmdjyTests.HisServices.HisInterfaceSoap.PostPrescriptionInfo(CmdjyTests.HisServices.PostPrescriptionInfoRequest request) { - return base.Channel.PostPrescriptionInfo(request); + CmdjyTests.HisServices.PostPrescriptionResponse CmdjyTests.HisServices.HisInterfaceSoap.PostPrescription(CmdjyTests.HisServices.PostPrescriptionRequest request) { + return base.Channel.PostPrescription(request); } - public string PostPrescriptionInfo(CmdjyTests.HisServices.HisPrescriptionInfo info) { - CmdjyTests.HisServices.PostPrescriptionInfoRequest inValue = new CmdjyTests.HisServices.PostPrescriptionInfoRequest(); - inValue.Body = new CmdjyTests.HisServices.PostPrescriptionInfoRequestBody(); - inValue.Body.info = info; - CmdjyTests.HisServices.PostPrescriptionInfoResponse retVal = ((CmdjyTests.HisServices.HisInterfaceSoap)(this)).PostPrescriptionInfo(inValue); - return retVal.Body.PostPrescriptionInfoResult; + public string PostPrescription(string msg) { + CmdjyTests.HisServices.PostPrescriptionRequest inValue = new CmdjyTests.HisServices.PostPrescriptionRequest(); + inValue.Body = new CmdjyTests.HisServices.PostPrescriptionRequestBody(); + inValue.Body.msg = msg; + CmdjyTests.HisServices.PostPrescriptionResponse retVal = ((CmdjyTests.HisServices.HisInterfaceSoap)(this)).PostPrescription(inValue); + return retVal.Body.PostPrescriptionResult; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - System.Threading.Tasks.Task CmdjyTests.HisServices.HisInterfaceSoap.PostPrescriptionInfoAsync(CmdjyTests.HisServices.PostPrescriptionInfoRequest request) { - return base.Channel.PostPrescriptionInfoAsync(request); + System.Threading.Tasks.Task CmdjyTests.HisServices.HisInterfaceSoap.PostPrescriptionAsync(CmdjyTests.HisServices.PostPrescriptionRequest request) { + return base.Channel.PostPrescriptionAsync(request); } - public System.Threading.Tasks.Task PostPrescriptionInfoAsync(CmdjyTests.HisServices.HisPrescriptionInfo info) { - CmdjyTests.HisServices.PostPrescriptionInfoRequest inValue = new CmdjyTests.HisServices.PostPrescriptionInfoRequest(); - inValue.Body = new CmdjyTests.HisServices.PostPrescriptionInfoRequestBody(); - inValue.Body.info = info; - return ((CmdjyTests.HisServices.HisInterfaceSoap)(this)).PostPrescriptionInfoAsync(inValue); + public System.Threading.Tasks.Task PostPrescriptionAsync(string msg) { + CmdjyTests.HisServices.PostPrescriptionRequest inValue = new CmdjyTests.HisServices.PostPrescriptionRequest(); + inValue.Body = new CmdjyTests.HisServices.PostPrescriptionRequestBody(); + inValue.Body.msg = msg; + return ((CmdjyTests.HisServices.HisInterfaceSoap)(this)).PostPrescriptionAsync(inValue); } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - CmdjyTests.HisServices.PostDrugInfoResponse CmdjyTests.HisServices.HisInterfaceSoap.PostDrugInfo(CmdjyTests.HisServices.PostDrugInfoRequest request) { - return base.Channel.PostDrugInfo(request); + CmdjyTests.HisServices.PostDrugResponse CmdjyTests.HisServices.HisInterfaceSoap.PostDrug(CmdjyTests.HisServices.PostDrugRequest request) { + return base.Channel.PostDrug(request); } - public string PostDrugInfo(CmdjyTests.HisServices.HisDrugInfo info) { - CmdjyTests.HisServices.PostDrugInfoRequest inValue = new CmdjyTests.HisServices.PostDrugInfoRequest(); - inValue.Body = new CmdjyTests.HisServices.PostDrugInfoRequestBody(); - inValue.Body.info = info; - CmdjyTests.HisServices.PostDrugInfoResponse retVal = ((CmdjyTests.HisServices.HisInterfaceSoap)(this)).PostDrugInfo(inValue); - return retVal.Body.PostDrugInfoResult; + public string PostDrug(string msg) { + CmdjyTests.HisServices.PostDrugRequest inValue = new CmdjyTests.HisServices.PostDrugRequest(); + inValue.Body = new CmdjyTests.HisServices.PostDrugRequestBody(); + inValue.Body.msg = msg; + CmdjyTests.HisServices.PostDrugResponse retVal = ((CmdjyTests.HisServices.HisInterfaceSoap)(this)).PostDrug(inValue); + return retVal.Body.PostDrugResult; } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - System.Threading.Tasks.Task CmdjyTests.HisServices.HisInterfaceSoap.PostDrugInfoAsync(CmdjyTests.HisServices.PostDrugInfoRequest request) { - return base.Channel.PostDrugInfoAsync(request); + System.Threading.Tasks.Task CmdjyTests.HisServices.HisInterfaceSoap.PostDrugAsync(CmdjyTests.HisServices.PostDrugRequest request) { + return base.Channel.PostDrugAsync(request); } - public System.Threading.Tasks.Task PostDrugInfoAsync(CmdjyTests.HisServices.HisDrugInfo info) { - CmdjyTests.HisServices.PostDrugInfoRequest inValue = new CmdjyTests.HisServices.PostDrugInfoRequest(); - inValue.Body = new CmdjyTests.HisServices.PostDrugInfoRequestBody(); - inValue.Body.info = info; - return ((CmdjyTests.HisServices.HisInterfaceSoap)(this)).PostDrugInfoAsync(inValue); + public System.Threading.Tasks.Task PostDrugAsync(string msg) { + CmdjyTests.HisServices.PostDrugRequest inValue = new CmdjyTests.HisServices.PostDrugRequest(); + inValue.Body = new CmdjyTests.HisServices.PostDrugRequestBody(); + inValue.Body.msg = msg; + return ((CmdjyTests.HisServices.HisInterfaceSoap)(this)).PostDrugAsync(inValue); } } } diff --git a/WebSiteCode/Cmdjy/CmdjyTests/HisInterfaceTests.cs b/WebSiteCode/Cmdjy/CmdjyTests/HisInterfaceTests.cs index a3eb9e1..b94bb18 100644 --- a/WebSiteCode/Cmdjy/CmdjyTests/HisInterfaceTests.cs +++ b/WebSiteCode/Cmdjy/CmdjyTests/HisInterfaceTests.cs @@ -9,6 +9,7 @@ using CmdjyTests.HisServices; using Newtonsoft.Json; using Cmdjy.Dal; using System.Reflection; +using HisInterfaceModels; namespace Cmdjy.ws.Tests { @@ -18,7 +19,7 @@ namespace Cmdjy.ws.Tests [TestMethod()] public void PostPrescriptionInfoTest() { var service = new HisInterfaceSoapClient(); - var newpres = new CmdjyTests.HisServices.HisPrescriptionInfo { + var newpres = new HisPrescriptionInfo { Area = "Area",Bed = "Bed",CardNo = "CardNo",CompanyCode = "CompanyCode", CompanyName = "CompanyName",DepName = "DepName",Diagnosis = "Diagnosis",District = "District", DoctorName = "DoctorName",DrugCount = "DrugCount",HosName = "HosName",HosNo = "HosNo",InvoiceNo = "InvoiceNo", @@ -27,9 +28,10 @@ namespace Cmdjy.ws.Tests PatientNo = "PatientNo",PatientPhone = "PatientPhone",PatientSex = "PatientSex",PostAddress = "PostAddress", PostDatatime = "PostDatatime",PrescriptionDatatime = "PrescriptionDatatime",PrescriptionNo = "PrescriptionNo", RawRecordId = "RawRecordId",Remark = "Remark",Sffyxh = "Sffyxh",Sfxh = 1,TakeBack = "TakeBack", - Type = CmdjyTests.HisServices.PrescriptionType.Order,Usage = "Usage",UseCount = "UseCount",Zlh = "Zlh", + Type = PrescriptionType.Order,Usage = "Usage",UseCount = "UseCount",Zlh = "Zlh", }; - var result = service.PostPrescriptionInfo(newpres); + var msg = JsonConvert.SerializeObject(newpres); + var result = service.PostPrescription(msg); Console.WriteLine($"result:{result}"); var rObj = JsonConvert.DeserializeObject(result); Assert.IsTrue(rObj.Code == ResultCode.Success); @@ -40,10 +42,13 @@ namespace Cmdjy.ws.Tests var fst = qu.First(); foreach(PropertyInfo p in newpres.GetType().GetProperties()) { var dbp = fst.GetType().GetProperties().Where(m => m.Name == p.Name); - Assert.IsTrue(dbp.Any()); + Assert.IsTrue(dbp.Any(),$"不包含属性{p.Name}"); var lv = p.GetValue(newpres); var dbv = fst.GetType().GetProperties().First(m => m.Name == p.Name).GetValue(fst); - Assert.IsTrue(dbv.Equals(lv)); + var bj = + p.Name == "Type" ? dbv.ToString() == lv.ToString() : + dbv.Equals(lv); + Assert.IsTrue(bj,$"属性比较失败：{p.Name}:{dbv}:{lv}"); } foreach(var item in qu) { db.Entry(item).State = System.Data.Entity.EntityState.Deleted; @@ -52,24 +57,4 @@ namespace Cmdjy.ws.Tests } } } - - /// - /// HIS发送处方信息应答 - /// - public class HisPrescriptionResult - { - /// - /// 返回结果代码 - /// - public ResultCode Code { get; set; } - /// - /// 返回信息。如执行错误包含错误信息 - /// - public string Msg { get; set; } - /// - /// 处方流水号，执行错误为空 - /// - public string PrescriptionId { get; set; } - } - } \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/CmdjyTests/app.config b/WebSiteCode/Cmdjy/CmdjyTests/app.config index 4c039fb..07016e7 100644 --- a/WebSiteCode/Cmdjy/CmdjyTests/app.config +++ b/WebSiteCode/Cmdjy/CmdjyTests/app.config @@ -25,6 +25,10 @@ + + + + diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/HisDrugInfo.cs b/WebSiteCode/Cmdjy/HisInterfaceModels/HisDrugInfo.cs new file mode 100644 index 0000000..f4264fd --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/HisDrugInfo.cs @@ -0,0 +1,49 @@ +namespace HisInterfaceModels +{ + /// + /// HIS发送的药品信息 + /// + public class HisDrugInfo + { + /// + /// 处方流水号 + /// + public string PrescriptionId { get; set; } + /// + /// "药品医保代码":"YP0306401000650", + /// + public string DrugNo { get; set; } + /// + /// 药品单价 0.085 + /// + public string Price { get; set; } + /// + /// 单贴数量 + /// + public string Count { get; set; } + /// + /// 单位 克 + /// + public string Unit { get; set; } + /// + /// 单项总价 + /// + public string Sum { get; set; } + /// + /// 规格 15.00000000 + /// + public string DrugType { get; set; } + /// + /// 药品编码 + /// + public string DrugLocalNo { get; set; } + /// + /// 药品名称 + /// + public string DrugName { get; set; } + /// + /// 特殊要求 + /// + public string Remark { get; set; } + } +} diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/HisDrugResult.cs b/WebSiteCode/Cmdjy/HisInterfaceModels/HisDrugResult.cs new file mode 100644 index 0000000..43f3dff --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/HisDrugResult.cs @@ -0,0 +1,21 @@ +namespace HisInterfaceModels +{ + /// + /// HIS发送的药品信息应答 + /// + public class HisDrugResult + { + /// + /// 返回结果代码 + /// + public ResultCode Code { get; set; } + /// + /// 返回信息。如执行错误包含错误信息 + /// + public string Msg { get; set; } + /// + /// 药品流水号，执行错误为空 + /// + public string DrugId { get; set; } + } +} diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/HisInterfaceModels.csproj b/WebSiteCode/Cmdjy/HisInterfaceModels/HisInterfaceModels.csproj new file mode 100644 index 0000000..c4d5036 --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/HisInterfaceModels.csproj @@ -0,0 +1,53 @@ + + + + + Debug + AnyCPU + {D0FE758C-DA33-45C7-8110-563056A58717} + Library + Properties + HisInterfaceModels + HisInterfaceModels + v4.6.1 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/HisPrescriptionInfo.cs b/WebSiteCode/Cmdjy/HisInterfaceModels/HisPrescriptionInfo.cs new file mode 100644 index 0000000..f00ed65 --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/HisPrescriptionInfo.cs @@ -0,0 +1,153 @@ +namespace HisInterfaceModels +{ + /// + /// HIS发送的处方信息 + /// + public class HisPrescriptionInfo + { + /// + /// 处方类型 + /// + public PrescriptionType Type { get; set; } + /// + /// 如果为退方，这里传要退的处方流水号。此编号在下单应答消息中提供 + /// + public string RawRecordId { get; set; } + /// + /// 药品明细数量 + /// + public string DrugCount { get; set; } + /// + /// 处方备注 + /// + public string Remark { get; set; } + /// + /// 带回病房 否 + /// + public string TakeBack { get; set; } + /// + /// "操作类型": "煎药自取", or "操作类型": "煎药快递", or "操作类型": "配药快递" + /// + public string OpType { get; set; } + /// + /// 操作员 + /// + public string OpUser { get; set; } + /// + /// 病区 + /// + public string Area { get; set; } + /// + /// 病床号 + /// + public string Bed { get; set; } + /// + /// 操作时间 + /// + public string OpDatatime { get; set; } + /// + /// 处方号 + /// + public string PrescriptionNo { get; set; } + /// + /// 处方日期 + /// + public string PrescriptionDatatime { get; set; } + /// + /// 单位编号 医疗机构编号 + /// + public string HosNo { get; set; } + /// + /// 医疗机构名称 + /// + public string HosName { get; set; } + /// + /// 发票号 + /// + public string InvoiceNo { get; set; } + /// + /// 病人编号 + /// + public string PatientNo { get; set; } + /// + /// 病人卡号 + /// + public string CardNo { get; set; } + /// + /// 科室名称 + /// + public string DepName { get; set; } + /// + /// 病人年龄 + /// + public string PatientAge { get; set; } + /// + /// 病人生日 + /// + public string PatientBrithday { get; set; } + /// + /// 病人手机号码 + /// + public string PatientMobile { get; set; } + /// + /// 病人电话 + /// + public string PatientPhone { get; set; } + /// + /// 所在区县街道 + /// + public string District { get; set; } + /// + /// 送货地址 + /// + public string PostAddress { get; set; } + /// + /// 送货时间 + /// + public string PostDatatime { get; set; } + /// + /// 贴数 + /// + public string UseCount { get; set; } + /// + /// 病人性别 + /// + public string PatientSex { get; set; } + /// + /// 病人姓名 + /// + public string PatientName { get; set; } + /// + /// 医生姓名 + /// + public string DoctorName { get; set; } + /// + /// 诊断 + /// + public string Diagnosis { get; set; } + /// + /// 用法 + /// + public string Usage { get; set; } + /// + /// 治疗号 + /// + public string Zlh { get; set; } + /// + /// 收费序号 + /// + public int Sfxh { get; set; } + /// + /// 收费费用序号 + /// + public string Sffyxh { get; set; } + /// + /// 代煎药厂商代码 + /// + public string CompanyCode { get; set; } + /// + /// 代煎药厂商名称 + /// + public string CompanyName { get; set; } + } +} diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/HisPrescriptionResult.cs b/WebSiteCode/Cmdjy/HisInterfaceModels/HisPrescriptionResult.cs new file mode 100644 index 0000000..129546d --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/HisPrescriptionResult.cs @@ -0,0 +1,21 @@ +namespace HisInterfaceModels +{ + /// + /// HIS发送处方信息应答 + /// + public class HisPrescriptionResult + { + /// + /// 返回结果代码 + /// + public ResultCode Code { get; set; } + /// + /// 返回信息。如执行错误包含错误信息 + /// + public string Msg { get; set; } + /// + /// 处方流水号，执行错误为空 + /// + public string PrescriptionId { get; set; } + } +} diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/IHisPostInfo.cs b/WebSiteCode/Cmdjy/HisInterfaceModels/IHisPostInfo.cs new file mode 100644 index 0000000..c287f62 --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/IHisPostInfo.cs @@ -0,0 +1,21 @@ +namespace HisInterfaceModels +{ + /// + /// 医疗机构接口 + /// + public interface IHisPostInfo + { + /// + ///上传处方信息 + /// + /// 处方信息HisPrescriptionInfo + /// 处方上传结果HisPrescriptionResult + string PostPrescription(string info); + /// + /// 上传药品信息 + /// + /// 药品信息HisDrugInfo + /// 药品上传结果HisDrugResult + string PostDrug(string info); + } +} diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/PrescriptionType.cs b/WebSiteCode/Cmdjy/HisInterfaceModels/PrescriptionType.cs new file mode 100644 index 0000000..2e311f2 --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/PrescriptionType.cs @@ -0,0 +1,24 @@ +using System; + +namespace HisInterfaceModels +{ + /// + /// 处方类型 + /// + [Flags] + public enum PrescriptionType + { + /// + /// 订单 + /// + Order = 1, + /// + /// 撤销订单，退单 + /// + CancelOrder = 2, + /// + /// 测试方。测试处方不会发送给第三方 + /// + TestOrder = 4, + } +} diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/Properties/AssemblyInfo.cs b/WebSiteCode/Cmdjy/HisInterfaceModels/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..f17f46b --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("HisInterfaceModels")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("HisInterfaceModels")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("d0fe758c-da33-45c7-8110-563056a58717")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WebSiteCode/Cmdjy/HisInterfaceModels/ResultCode.cs b/WebSiteCode/Cmdjy/HisInterfaceModels/ResultCode.cs new file mode 100644 index 0000000..3469c71 --- /dev/null +++ b/WebSiteCode/Cmdjy/HisInterfaceModels/ResultCode.cs @@ -0,0 +1,21 @@ +using System; + +namespace HisInterfaceModels +{ + + /// + /// 接口执行结果 + /// + [Flags] + public enum ResultCode + { + /// + /// 执行成功。 + /// + Success = 1, + /// + /// 发生异常 + /// + Exception = 2, + } +}