-
+
-
+
+
+
+
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonChargeCategoryForm.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonChargeCategoryForm.cshtml
new file mode 100644
index 00000000..ab0968fd
--- /dev/null
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonChargeCategoryForm.cshtml
@@ -0,0 +1,206 @@
+@{
+ ViewBag.Title = "Form";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+
+
+
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonMedicineAdd.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonMedicineAdd.cshtml
new file mode 100644
index 00000000..8dccc5b7
--- /dev/null
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonMedicineAdd.cshtml
@@ -0,0 +1,1381 @@
+@{
+ ViewBag.Title = "SysCommonMedicineAdd";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+
+
+
+
\ No newline at end of file
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonStuffAdd.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonStuffAdd.cshtml
new file mode 100644
index 00000000..bf750a8c
--- /dev/null
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysCommonStuffAdd.cshtml
@@ -0,0 +1,1367 @@
+@{
+ ViewBag.Title = "SysCommonStuffAdd";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+
+
+
+
\ No newline at end of file
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysMedicalOrderFrequencyForm.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysMedicalOrderFrequencyForm.cshtml
new file mode 100644
index 00000000..e89506d6
--- /dev/null
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/CommonLibrary/SysMedicalOrderFrequencyForm.cshtml
@@ -0,0 +1,153 @@
+@using Newtouch.Common.Operator;
+@{
+ ViewBag.Title = "Form";
+ Layout = "~/Views/Shared/_Form.cshtml";
+}
+
+
+
+
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/Department/Index.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/Department/Index.cshtml
index 72e95faf..3f12d378 100644
--- a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/Department/Index.cshtml
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/Department/Index.cshtml
@@ -2,6 +2,8 @@
@{
ViewBag.Title = "Index";
Layout = "~/Views/Shared/_Index.cshtml";
+
+ var opr = Newtouch.Common.Operator.OperatorProvider.GetCurrent();
}
+
+ @* 收费大类tab *@
+
+ @Html.Partial("_OrganizeIdDDLToolbarSearchView")
+
+
+
+
+
+
+
+ | 中西药： | ++ + | +有效状态： | ++ + | ++ | 药品分类： | ++ + + | +
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ @* 耗材tab *@
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+ @* 收费项目tab *@
+
+
+
+
+
+
+
+
+ | 有效状态： | ++ + | ++ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ @* 医嘱频次 *@
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+ | 有效状态： | ++ + | +
| *组织机构： | +组织机构： | - | @@ -148,8 +148,10 @@ if (!$('#form1').formValid()) { return false; } - debugger + debugger var postData = $("#form1").formSerialize(); + if (!postData.OrganizeId) + postData.OrganizeId = "*"; $.submitForm({ url: "/SysDiagnosis/SubmitForm?keyValue=" + keyValue, param: postData, diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysDiagnosis/Index.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysDiagnosis/Index.cshtml index 3c21d6e6..08c36a50 100644 --- a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysDiagnosis/Index.cshtml +++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysDiagnosis/Index.cshtml @@ -46,18 +46,18 @@ height: $(window).height() - 128, colModel: [ { label: "主键", name: "zdId", hidden: true }, - { label: '国临版诊断名称', name: 'zdmc', width: 100, align: 'left' }, + { label: '国临版诊断名称', name: 'zdmc', width: 150, align: 'left' }, { label: "国临版诊断编码", name: "zdCode", width: 100, align: 'left' }, { label: "诊断类型", name: "zdlx", width: 100, align: 'left' }, - { label: 'ICD10', name: 'icd10', width: 80, align: 'left', hidden: true }, - { label: '医保版编码', name: 'zdCode_yb', width: 80, align: 'left'}, - { label: 'ICD10附加码', name: 'icd10fjm', width: 80, align: 'left', hidden: true }, - { label: '医保版诊断', name: 'zdmc_yb', width: 80, align: 'left'}, - { label: '国家码', name: 'gjybdm', width: 80, align: 'left' }, - { label: '首拼', name: 'py', width: 60, align: 'left' }, - { label: '五笔', name: 'wb', width: 60, align: 'left' }, + { label: 'ICD10', name: 'icd10', width: 100, align: 'left' }, + { label: 'ICD10附加码', name: 'icd10fjm', width: 100, align: 'left' }, + { label: '医保版诊断', name: 'zdmc_yb', width: 150, align: 'left' }, + { label: '医保版编码', name: 'zdCode_yb', width: 80, align: 'left' }, + //{ label: '国家码', name: 'gjybdm', width: 80, align: 'left' }, + { label: '首拼', name: 'py', width: 80, align: 'left' }, + { label: '五笔', name: 'wb', width: 60, align: 'left', hidden: true }, { - label: "允许编辑", name: "AllowEdit", width: 60, align: "left", + label: "允许编辑", name: "AllowEdit", width: 60, align: "left",hidden: true , formatter: function (cellvalue, a, rowData) { return !(!!!rowData.OrganizeId || rowData.OrganizeId === '*') ? "" : ""; } @@ -67,7 +67,7 @@ { label: '创建时间', name: 'CreateTime', width: 80, align: 'left', formatter: "date", formatoptions: { srcformat: 'Y-m-d', newformat: 'Y-m-d' } }, { label: '最后修改', name: 'LastModifierCode', width: 60, align: 'left' }, { label: '最后修改时间', name: 'LastModifyTime', width: 80, align: 'left', formatter: "date", formatoptions: { srcformat: 'Y-m-d', newformat: 'Y-m-d' } }, - { label: '排序', name: 'px', width: 40, align: 'left' } + { label: '排序', name: 'px', width: 40, align: 'left', hidden: true } ], pager: "#gridPager", sortname: 'CreateTime desc', @@ -109,10 +109,10 @@ $.modalAlert("请选中一条信息", 'warning'); return; } - var AllowEdit = $("#gridList").jqGridRowValue().AllowEdit; - if (AllowEdit.indexOf('fa-toggle-off') >= 0) { - return; - } + //var AllowEdit = $("#gridList").jqGridRowValue().AllowEdit; + //if (AllowEdit.indexOf('fa-toggle-off') >= 0) { + // return; + //} var keyValue = $("#gridList").jqGridRowValue().zdId; $.modalOpen({ id: "Form", diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicalOrderFrequency/Form.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicalOrderFrequency/Form.cshtml index a61bd9ea..54eeb37b 100644 --- a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicalOrderFrequency/Form.cshtml +++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicalOrderFrequency/Form.cshtml @@ -53,13 +53,22 @@|||||
| *执行周期时间单位： | - + @**@ + | ||||||
|---|---|---|---|---|---|---|---|
| 周标志： | - + @**@ + | ||||||
| *组织机构： | -+ | @@ -52,6 +52,14 @@ | ++ *大类： + | ++ + | |||
| @@ -67,12 +75,10 @@ | - *大类： + *编码： | - + | |||||
| - *编码： + *药品规格： | - + | *药厂名称： @@ -106,12 +112,7 @@ | -- *药品规格： - | -- - | +*剂型： | @@ -119,6 +120,12 @@ +抗生素： | ++ + + + |
| *剂量单位： | @@ -144,49 +151,51 @@ -抗生素： | +默认用法： | - - - + + | ||||
| *医保标志： |
-
+ @* *@
*@
-
+ @* |
国家医保代码： | -+ | - | |||
| 国家医保名称： | + | ||||||
| 省医保代码： | + | 医保规格： | ++ + | - 默认用法： + 库存预警值： | - - + | ||
| - | 医保规格： | -- - | + +|||||
|
@@ -1120,6 +1127,7 @@
function InitYfbmByNewDrug() {
$.najax({
url: "/SysMedicine/GetAllYfbm",
+ data: { organizeId: $.request('orgId') },
dataType: "json",
success: function (data) {
if (!!data.data) {
@@ -1140,9 +1148,10 @@
//刷新授权药房
function RefreshEmpowermentPharmacyDepartment() {
if (!keyValue) return false;
+ var organizeId = $("#OrganizeId").val();
$.najax({
url: "/SysMedicine/GetEmpowermentPharmacyDepartment",
- data: { ypId: keyValue },
+ data: { ypId: keyValue, organizeId: $.request('orgId') },
dataType: "json",
async: false,
success: function (data) {
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicineElectronicPrescription/Index.cshtml b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicineElectronicPrescription/Index.cshtml
new file mode 100644
index 00000000..8b1f5086
--- /dev/null
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Views/SysMedicineElectronicPrescription/Index.cshtml
@@ -0,0 +1,138 @@
+@using Newtouch.Common.Operator;
+@{
+ ViewBag.Title = "电子处方药品管理";
+ Layout = "~/Views/Shared/_Index.cshtml";
+
+ var opr = Newtouch.Common.Operator.OperatorProvider.GetCurrent();
+}
+
+
+
+
diff --git a/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Web.9_190.config b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Web.9_190.config
new file mode 100644
index 00000000..6324a42e
--- /dev/null
+++ b/Newtouch.HIS.Base/Newtouch.HIS.Base.HOSP/Web.9_190.config
@@ -0,0 +1,36 @@
+
+
+
+
+
-
diff --git a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/DoctorManage/Controllers/DoctorsAdviceController.cs b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/DoctorManage/Controllers/DoctorsAdviceController.cs
index 64320842..58ba9eb3 100644
--- a/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/DoctorManage/Controllers/DoctorsAdviceController.cs
+++ b/Newtouch.HIS.CIS/Newtouch.CIS.Web/Areas/DoctorManage/Controllers/DoctorsAdviceController.cs
@@ -43,28 +43,38 @@ public override ActionResult Index()
return View("ZyyzQuery");
}
ViewBag.ysgh = UserIdentity.rygh;//医生工号
- ViewBag.pcStr = _sysConfigRepo.GetValueByCode("FrequencyStr", OrganizeId)== "" ? "": _sysConfigRepo.GetValueByCode("FrequencyStr", OrganizeId);//临时频次
- ViewBag.bhbq = _sysConfigRepo.GetBoolValueByCode("DoctorServiceTemplate", OrganizeId,true);//住院医嘱套餐是否包含病区
- ViewBag.zzlconfig = _sysConfigRepo.GetValueByCode("zllconfig", OrganizeId)=="" ? "每次治疗量": _sysConfigRepo.GetValueByCode("zllconfig", OrganizeId);//住院项目录入治疗量文本配置
+ ViewBag.pcStr = _sysConfigRepo.GetValueByCode("FrequencyStr", OrganizeId) == "" ? "" : _sysConfigRepo.GetValueByCode("FrequencyStr", OrganizeId);//临时频次
+ ViewBag.bhbq = _sysConfigRepo.GetBoolValueByCode("DoctorServiceTemplate", OrganizeId, true);//住院医嘱套餐是否包含病区
+ ViewBag.zzlconfig = _sysConfigRepo.GetValueByCode("zllconfig", OrganizeId) == "" ? "每次治疗量" : _sysConfigRepo.GetValueByCode("zllconfig", OrganizeId);//住院项目录入治疗量文本配置
ViewBag.bwhide = _sysConfigRepo.GetBoolValueByCode("bwhide", OrganizeId, false);//住院项目录入部位显示隐藏配置
- ViewBag.IsOpenJyJcSwitch = _sysConfigRepo.GetBoolValueByCode("OpenZYJyJcSwitch", this.OrganizeId,false);//是否开放检验检查
- ViewBag.IsOpenRehabSwitch = _sysConfigRepo.GetBoolValueByCode("OpenZYRehabSwitch", this.OrganizeId, false);//是否开放康复医嘱
- ViewBag.sfxmService = _sysConfigRepo.GetValueByCode("sfxmService", this.OrganizeId)=="" ? "cg" : _sysConfigRepo.GetValueByCode("sfxmService", this.OrganizeId);//是否开常规项目
- ViewBag.ISOpenSsyz= _sysConfigRepo.GetBoolValueByCode("ISOpenSsyzSwitch", this.OrganizeId, false);//是否开放膳食医嘱
- ViewBag.ISWithRehabSuggestion = _sysConfigRepo.GetBoolValueByCode("IS_WithRehabSuggestion", this.OrganizeId, false);//康复处方是否引用治疗建议
- //临时频次
- var frequencyStr = _sysConfigRepo.GetValueByCode("FrequencyStr", OrganizeId) ?? "";
+ ViewBag.IsOpenJyJcSwitch = _sysConfigRepo.GetBoolValueByCode("OpenZYJyJcSwitch", this.OrganizeId, false);//是否开放检验检查
+ ViewBag.IsOpenRehabSwitch = _sysConfigRepo.GetBoolValueByCode("OpenZYRehabSwitch", this.OrganizeId, false);//是否开放康复医嘱
+
+ ViewBag.ISOpenWzhc = _sysConfigRepo.GetBoolValueByCode("openWzhccf", this.OrganizeId);//开关：是否开放医用耗材
+ ViewBag.sfxmService = _sysConfigRepo.GetValueByCode("sfxmService", this.OrganizeId) == "" ? "cg" : _sysConfigRepo.GetValueByCode("sfxmService", this.OrganizeId);//是否开常规项目
+ ViewBag.ISOpenSsyz = _sysConfigRepo.GetBoolValueByCode("ISOpenSsyzSwitch", this.OrganizeId, false);//是否开放膳食医嘱
+ ViewBag.ISWithRehabSuggestion = _sysConfigRepo.GetBoolValueByCode("IS_WithRehabSuggestion", this.OrganizeId, false);//康复处方是否引用治疗建议
+
+ var frequencyStr = _sysConfigRepo.GetValueByCode("FrequencyStr", OrganizeId) ?? "";//临时频次串 分割的频次编码字符串例如：00,01
ViewBag.isqfswith = _sysConfigRepo.GetValueByCode("accountqfexecute_switch", OrganizeId);//欠费医嘱开立、执行开关
ViewBag.isopenPriorReview = _sysConfigRepo.GetValueByCode("OpenPriorReview", OrganizeId);//是否开启事前审核接口
+ ViewBag.openYjzxSwitch = _sysConfigRepo.GetValueByCode("openYjzxSwitch", OrganizeId); //开关：医技管理是否启用
if (!string.IsNullOrWhiteSpace(frequencyStr))
{
var FequencyList = frequencyStr.Split(',');
var pcInfo = _iDoctorserviceDmnService.getpcInfoByCode(FequencyList[0], OrganizeId);
- ViewBag.pccode = pcInfo.yzpcCode;
- ViewBag.zxcs = pcInfo.zxcs;
- ViewBag.zxzq = pcInfo.zxzq;
- ViewBag.zxzqdw = pcInfo.zxzqdw;
- ViewBag.pcmc = pcInfo.yzpcmc;
+ if (pcInfo != null)
+ {
+ ViewBag.pccode = pcInfo.yzpcCode;
+ ViewBag.zxcs = pcInfo.zxcs;
+ ViewBag.zxzq = pcInfo.zxzq;
+ ViewBag.zxzqdw = pcInfo.zxzqdw;
+ ViewBag.pcmc = pcInfo.yzpcmc;
+ }
+ else {
+ throw new Exception($"未找到有效的医嘱频次信息 (医嘱频次编号: {FequencyList[0]})，请稍后重试或联系管理员。");
+ }
+
}
#region 抗生素相关
ViewBag.IsQyKssKz = _sysConfigRepo.GetBoolValueByCode("openKssQxSwitch", OrganizeId);//是否启用抗生素
@@ -91,6 +101,7 @@ public override ActionResult Index()
#endregion 抗生素相关
//影像配置
ViewBag.PACSCode = _sysConfigRepo.GetValueByCode("PACSCode", OrganizeId);
+ ViewBag.isOpenRationalUse = _sysConfigRepo.GetValueByCode("OpenRationalUse", OrganizeId);//是否开启合理用药
#region 滴速
var frds = _sysConfigRepo.GetValueByCode("frequencyRelDroppingSpeed", OrganizeId);
@@ -99,7 +110,7 @@ public override ActionResult Index()
#endregion
//是否开启中草药医嘱
- ViewBag.ISOpenzcyyzSwitch = _sysConfigRepo.GetBoolValueByCode("ISOpenzcyyzSwitch", OrganizeId,false);
+ ViewBag.ISOpenzcyyzSwitch = _sysConfigRepo.GetBoolValueByCode("ISOpenzcyyzSwitch", OrganizeId, false);
return View();
}
@@ -107,6 +118,7 @@ public override ActionResult Index()
public ActionResult AdviceList()
{
ViewBag.isopenPriorReview = _sysConfigRepo.GetValueByCode("OpenPriorReview", OrganizeId);//是否开启事前审核接口
+ ViewBag.isOpenRationalUse = _sysConfigRepo.GetValueByCode("OpenRationalUse", OrganizeId);//是否开启合理用药
return View();
}
@@ -114,25 +126,28 @@ public ActionResult AdviceListLook()
{
return View();
}
-
public ActionResult ZyyzQueryAdviceList()
{
return View();
}
- public ActionResult AdviceStop() {
+ public ActionResult AdviceStop()
+ {
return View();
}
- public ActionResult AdviceLeaveHospitalStop() {
+ public ActionResult AdviceLeaveHospitalStop()
+ {
return View();
}
- public ActionResult ContinuePrint() {
+ public ActionResult ContinuePrint()
+ {
return View();
}
- public ActionResult TemplatePresForm() {
+ public ActionResult TemplatePresForm()
+ {
return View();
}
public ActionResult HistoricalOrders()
@@ -143,7 +158,8 @@ public ActionResult PatientHistoricalOrders()
{
return View();
}
- public ActionResult TransferWardStop() {
+ public ActionResult TransferWardStop()
+ {
return View();
}
#endregion
@@ -152,9 +168,9 @@ public ActionResult TransferWardStop() {
public ActionResult saveAsTemplate(InpatientOrderPackageEntity mbObj, List 新致医疗分公司：武汉 上海 杭州 常州 成都 重庆 贵阳 -上海新致软件股份有限公司©2016-2017 新致医疗版权所有 +
+ 本系统软件源代码来源于天天开源的许可
| |||||||
