1.样式调整:病案提交报表,病案提交明细

2.出院,在院主管医生搜索填写框(需改动,优化为所在科室内主管医生下拉框可选)
3.护理文书接口取消工号验证
master
zengwh 5 years ago
parent cf12b297f1
commit 07358d5235

@ -77,10 +77,10 @@ public class FontController {
* */
@RequestMapping("showRecordByPatientId")
public String showRecordByPatientId(String userName, String assortIds, String patientId, Model model){
//判断各参数
/* //判断各参数
if(StringUtils.isBlank(userName)){
return retrunErrorPage(model,"工号不能为空!");
}
}*/
if(StringUtils.isBlank(assortIds)){
return retrunErrorPage(model,"病案分类Id不能为空!");
}
@ -90,10 +90,10 @@ public class FontController {
List<Archive_Master> list = new ArrayList<>();
//判断工号是否存在
try {
String checkUserName = checkUserName(userName);
/* String checkUserName = checkUserName(userName);
if(StringUtils.isNotBlank(checkUserName)){
return retrunErrorPage(model,checkUserName);
}
}*/
//判断分类id是否存在,协商assortIds = "00000000"为查询全部
if(!allAddortIds.equals(assortIds)) {
String checkAssortIds = checkAssortIds(assortIds);

@ -13,13 +13,11 @@ import com.emr.entity.Archive_Master_Vo;
import com.emr.entity.OffsetLimitPage;
import com.emr.service.Archive_MasterService;
import com.emr.service.ipml.ArchiveFlowInfoService;
import com.emr.service.ipml.StatisticsService;
import com.emr.util.ExceptionPrintUtil;
import com.emr.util.ExportExcelUtil;
import com.emr.util.Msg;
import com.emr.util.OracleConnect;
import com.emr.vo.ArchiveFlowInfoVo;
import com.emr.vo.User;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.endpoint.Client;
import org.apache.shiro.SecurityUtils;
@ -49,8 +47,6 @@ public class beHospitaledController {
private ArchiveFlowRoleMapper flowRoleMapper;
@Autowired
private ArchiveFlowInfoService flowInfoService;
@Autowired
private StatisticsService statisticsService;
@RequestMapping(value = "/beHosps")
public String inHospitals(){
return "beHospitaledDir/beHospList";
@ -245,6 +241,13 @@ public class beHospitaledController {
model.addAttribute("list",list);
return "beHospitaledDir/timeLine";
}
@RequestMapping("loadDoctorInCharge")
@ResponseBody
private Msg loadDoctorInCharge(String deptName) throws Exception{
List<Archive_Master> list = archiveMasterService.loadDoctorInCharge(deptName);
return Msg.success().add("list",list);
}
}

@ -49,4 +49,6 @@ public interface Archive_MasterMapper {
int updateLockInfoByMasterId(@Param("masterIds")String masterIds,@Param("lockinfo")String lockinfo);
List<Archive_Master_Vo> selectDaysByMasterIds(List<Archive_Master_Vo> list);
List<Archive_Master> loadDoctorInCharge(@Param("deptName") String deptName);
}

@ -114,6 +114,8 @@ public interface Archive_MasterService {
Msg getRole();
List<Archive_Master_Vo> selectLastVerifyList(Archive_Master_Vo archiveMasterVo);
List<Archive_Master> loadDoctorInCharge(String deptName);
}

@ -203,7 +203,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
if(null != list && !list.isEmpty()){
//记帐号集合
StringBuilder patientIdStr = new StringBuilder();
//查询科室集合
Emr_Dictionary dictionary = new Emr_Dictionary();
dictionary.setTypecode("dept_code");
List<Emr_Dictionary> dictionaries = dictionaryMapper.dicByTypeCode(dictionary);
for (Archive_Master_Vo masterVo : list) {
//科室名称编码转名称
DeptNameCode2Name(dictionaries, masterVo);
//状态均为护士长已质控,取出一个对象,转换中文状态
Integer status = Integer.valueOf(masterVo.getArchivestate());
if(status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())){
@ -211,6 +217,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){
masterVo.setStatus(EnumVerify.DocState.CallBacked.getName());
}
//科室转换
//组织记帐号集合
if(StringUtils.isNotBlank(masterVo.getPatientId())) {
if (StringUtils.isNotBlank(patientIdStr)) {
@ -264,6 +271,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
return list;
}
@Override
public List<Archive_Master> loadDoctorInCharge(String deptName) {
return archiveMasterMapper.loadDoctorInCharge(deptName);
}
/**
*
* 退
@ -327,22 +339,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//查询出院天数
List<Archive_Master_Vo> selectDays = archiveMasterMapper.selectDaysByMasterIds(list);
for (Archive_Master_Vo vo:list) {
if(!CollectionUtils.isEmpty(dictionaries)) {
//在院科室
String deptAdmissionTo = vo.getDeptAdmissionTo();
//出院科室
String deptName = vo.getDeptName();
//住院科室
for (Emr_Dictionary dictionaryTemp : dictionaries) {
String name = dictionaryTemp.getName();
if (StringUtils.isNotBlank(deptAdmissionTo) && deptAdmissionTo.equals(dictionaryTemp.getCode())) {
vo.setDeptAdmissionTo(name);
}
if (StringUtils.isNotBlank(deptName) && deptName.equals(dictionaryTemp.getCode())) {
vo.setDeptName(name);
}
}
}
//科室名称编码转名称
DeptNameCode2Name(dictionaries, vo);
//赋值出院天数
if(!CollectionUtils.isEmpty(selectDays)){
for(Archive_Master_Vo days : selectDays){
@ -356,6 +354,30 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
}
/**
*
* @param dictionaries
* @param vo
*/
private void DeptNameCode2Name(List<Emr_Dictionary> dictionaries, Archive_Master_Vo vo) {
if(!CollectionUtils.isEmpty(dictionaries)) {
//在院科室
String deptAdmissionTo = vo.getDeptAdmissionTo();
//出院科室
String deptName = vo.getDeptName();
//住院科室
for (Emr_Dictionary dictionaryTemp : dictionaries) {
String name = dictionaryTemp.getName();
if (StringUtils.isNotBlank(deptAdmissionTo) && deptAdmissionTo.equals(dictionaryTemp.getCode())) {
vo.setDeptAdmissionTo(name);
}
if (StringUtils.isNotBlank(deptName) && deptName.equals(dictionaryTemp.getCode())) {
vo.setDeptName(name);
}
}
}
}
//验证字符串是否是数字
public static boolean isNumeric(String str){
for (int i = 0; i < str.length(); i++){

@ -514,7 +514,7 @@
<!--批量更新statusFlag = 0-->
<update id="updateSubmit">
update archive_other_ext
set statusFlag = 0
set statusFlag = 0,T2 = '1801-02-03'
<where>
<if test="ids != null and ids != ''">
ID in (${ids})

@ -165,8 +165,8 @@
<if test="lockinfo != null">
and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR}
</if>
<if test="doctorInCharge != null">
and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%'
<if test="doctorInCharge != null and doctorInCharge != ''">
and m.DOCTOR_IN_CHARGE in (${doctorInCharge})
</if>
<if test="dischargeDisposition != null">
and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR}
@ -208,7 +208,7 @@
</when>
</choose>
<if test="doctorInCharge != null and doctorInCharge != ''">
and m.DOCTOR_IN_CHARGE LIKE '%'+#{doctorInCharge,jdbcType=NVARCHAR}+'%'
and m.DOCTOR_IN_CHARGE in (${doctorInCharge})
</if>
</sql>
@ -434,8 +434,8 @@
<!--终审-->
<select id="selectByLast" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,d.name dept_admission_to
select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,
dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,dept_admission_to
,m.check_doctor,m.check_datetime,m.checked_doctor,m.checked_datetime,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,
datediff(day,m.discharge_date_time,getdate()) -
(select COUNT(1) from emr_holiday_set where date between convert(varchar(10),m.discharge_date_time,120)
@ -446,10 +446,6 @@
days
END from emr_overtime_set where id = 1) days
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') d
on m.dept_admission_to=d.code
LEFT JOIN (select code,name from emr_dictionary where parent_id='dept_code') f
on m.dept_name=f.code
where 1=1 and (ArchiveState = '64' or ArchiveState = '1024')
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
@ -1069,4 +1065,20 @@
<foreach collection="list" item="item" separator=",">#{item.id,jdbcType=NVARCHAR}</foreach>
)
</select>
<!--根据科室权限查询主管医生列表-->
<select id="loadDoctorInCharge" resultMap="BaseResultMap">
SELECT
DOCTOR_IN_CHARGE
FROM
archive_master
WHERE
DOCTOR_IN_CHARGE != ''
<if test="deptName != null and deptName != ''">
AND dept_name IN ( ${deptName} )
</if>
GROUP BY
DOCTOR_IN_CHARGE
ORDER BY
DOCTOR_IN_CHARGE
</select>
</mapper>

@ -38,6 +38,7 @@
<script type="text/javascript"
src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<script type="text/javascript" src="${path}/static/bootstrap-3.3.7/plugins/bootstrap-select/bootstrap-select.min.js"></script>
<script type="text/javascript" src="${path}/static/bootstrap-3.3.7/plugins/bootstrap-select/defaults-zh_CN.min.js"></script>
<!-- AdminLTE App -->
<script type="text/javascript" src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/adminlte.min.js"></script>
<%--导入导出--%>
@ -56,4 +57,5 @@
<script src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/fileinput.min.js"></script>
<script type="text/javascript" src="${path}/static/js/hospitalCommom/pinying.js"></script>
<script type="text/javascript" src="${path}/static/js/comm.js?t=2020-10-12"></script>
<script type="text/javascript" src="${path}/static/js/comm.js?t=2020-10-13"></script>
<input type="hidden" id="userId" value="${CURRENT_USER.userId}">

@ -132,8 +132,10 @@
<div class="form-inline">
<div class="form-group divCss8">
<label for="name">主管医生:</label>
<input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25"
placeholder="请输入主管医生姓名">
<select class="selectpicker bla bla bli" multiple data-live-search="true" data-actions-box="true" name="deptName"
id="doctorInCharge" title="请输入主管医生">
<option value="">全部</option>
</select>
</div>
<div class="form-group divCss8">
<label for="inpNo">&emsp;住院号:</label>
@ -750,7 +752,7 @@
</div>
</div>
</body>
<script src="${path}/static/js/beHospList/beHospList.js?time=2020-10-12"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-10-09_1"></script>
<script src="${path}/static/js/beHospList/beHospList.js?time=2020-10-13"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-10-13"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-09"></script>
</html>

@ -141,7 +141,7 @@
<script>
var path = "${path}";
</script>
<script src="${path}/static/js/faultList/faultList.js?time=2020-08-18"></script>
<script src="${path}/static/js/faultList/faultList.js?time=2020-10-13"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
</body>
</html>

@ -116,8 +116,10 @@
<div class="form-inline">
<div class="form-group divCss8">
<label for="name">主管医生:</label>
<input type="text" class="input-sm form-control" id="doctorInCharge" maxlength="25"
placeholder="请输入主管医生姓名">
<select class="selectpicker bla bla bli" multiple data-live-search="true" data-actions-box="true" name="deptName"
id="doctorInCharge" title="请输入主管医生">
<option value="">全部</option>
</select>
</div>
<div class="form-group divCss8">
<label for="inpNo">&emsp;住院号:</label>
@ -446,7 +448,7 @@
<script type="text/javascript">
var path = "${path}";
</script>
<script src="${path}/static/js/inHospList/inHospList.js?time=2020-09-11"></script>
<script src="${path}/static/js/inHospList/inHospList.js?time=2020-10-13"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-11"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-10-13"></script>
</html>

@ -132,7 +132,7 @@
}
}
}
localStorage.setItem("depts",depts);
localStorage.setItem($("#userId").val()+"_depts",depts);
for (var i = 0; i < list.length; i++) {
if (list[0].deptId == list[i].deptId) {
if (list[i].methodParent != 0 && (list[i].menuUrl == "#" || list[i].menuUrl == "" || list[i].menuUrl == null)) {

@ -646,8 +646,8 @@
</div>
</div>
</body>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-09-11_1"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-11"></script>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-10-13"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-10-13"></script>
<script src="${path}/static/js/statistics/getDeptCommom.js"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
</html>

@ -238,5 +238,5 @@
</div>
</div>
</body>
<script src="${path}/static/js/medicalRecallList/medicalRecallList.js?time=2020-09-11_1"></script>
<script src="${path}/static/js/medicalRecallList/medicalRecallList.js?time=2020-10-13"></script>
</html>

@ -50,7 +50,7 @@
</div>
<div class="mainDiv">
<!--搜索-->
<form style="margin-top:5px;margin-bottom: 0!important;height: 50px">
<form style="margin-top:5px;margin-bottom: 0!important;">
<div class="form-inline">
<div class="form-group divCss8">
<div class="input-group">

@ -97,7 +97,7 @@
</div>
<div class="mainDiv">
<!--搜索-->
<form style="margin-top:5px;margin-bottom: 0!important;height: 50px">
<form style="margin-top:5px;margin-bottom: 0!important;">
<div class="form-inline">
<div class="form-group divCss8">
<label>出院日期:</label>
@ -137,7 +137,7 @@
</div>
</div>
</form>
<div class="col-md-12" style="text-align: center">
<div class="col-md-12" style="text-align: center;">
<p>出院病人&nbsp;<span style="color:red" id="allCount">0</span>&nbsp;个,
其中已提交病历&nbsp;<span style="color:red" id="count1">0</span>&nbsp;个,
总体提交率&nbsp;<span style="color:red" id="count1Percent">0%</span>&nbsp;;

@ -592,7 +592,7 @@
<script type="text/javascript">
var path = "${path}";
</script>
<script src="${path}/static/js/unfileMedicalList/unfileMedicalList.js?time=2020-09-04"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-11"></script>
<script src="${path}/static/js/unfileMedicalList/unfileMedicalList.js?time=2020-10-13"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-10-13"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
</html>

@ -0,0 +1 @@
{"version":3,"sources":["../../../js/i18n/defaults-zh_CN.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAChB,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AACjC,IAAI,gBAAgB,CAAC,CAAC,UAAU,CAAC;AACjC,IAAI,eAAe,CAAC,CAAC,UAAU,CAAC;AAChC,IAAI,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACtC,IAAI,cAAc,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC;AAC9D,IAAI,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;AAC7B,IAAI,aAAa,CAAC,CAAC,KAAK,CAAC;AACzB,IAAI,eAAe,CAAC,CAAC,MAAM,CAAC;AAC5B,EAAE,EAAE,CAAC;AACL,GAAG,MAAM,EAAE,CAAC","file":"defaults-zh_CN.js","sourcesContent":["(function ($) {\r\n $.fn.selectpicker.defaults = {\r\n noneSelectedText: '没有选中任何项',\r\n noneResultsText: '没有找到匹配项',\r\n countSelectedText: '选中{1}中的{0}项',\r\n maxOptionsText: ['超出限制 (最多选择{n}项)', '组选择超出限制(最多选择{n}组)'],\r\n multipleSeparator: ', ',\r\n selectAllText: '全选',\r\n deselectAllText: '取消全选'\r\n };\r\n})(jQuery);\r\n"]}

@ -0,0 +1,8 @@
/*!
* Bootstrap-select v1.13.9 (https://developer.snapappointments.com/bootstrap-select)
*
* Copyright 2012-2019 SnapAppointments, LLC
* Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
*/
!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){e.fn.selectpicker.defaults={noneSelectedText:"\u6ca1\u6709\u9009\u4e2d\u4efb\u4f55\u9879",noneResultsText:"\u6ca1\u6709\u627e\u5230\u5339\u914d\u9879",countSelectedText:"\u9009\u4e2d{1}\u4e2d\u7684{0}\u9879",maxOptionsText:["\u8d85\u51fa\u9650\u5236 (\u6700\u591a\u9009\u62e9{n}\u9879)","\u7ec4\u9009\u62e9\u8d85\u51fa\u9650\u5236(\u6700\u591a\u9009\u62e9{n}\u7ec4)"],multipleSeparator:", ",selectAllText:"\u5168\u9009",deselectAllText:"\u53d6\u6d88\u5168\u9009"}});

@ -63,7 +63,7 @@ function initTable() {
startDateTo: $("#startDateTo").val(),
endDateTo: $("#endDateTo").val(),
deptName: getDeptNameForQuery(),
doctorInCharge:$("#doctorInCharge").val(),
doctorInCharge:getSelecteds('doctorInCharge'),
isSearch:$("#isSearch").val(),
status:$("#currentRoleIds").val(),
role:$("#currentRole").val(),
@ -703,6 +703,10 @@ $("#infoId").change(function(){
})
$(function () {
//加载主管医生列表
loadDoctorInCharge();
//加载权限科室
getPowerDept();
//赋值审核角色
getChecker();
//加载当前角色
@ -754,11 +758,11 @@ $(function () {
//导出excel功能
$("#excelBtn").click(function () {
var doctorInCharge = $("#doctorInCharge").val();
var doctorInCharge = getSelecteds("doctorInCharge");
var inpNo = $("#inpNo").val();
var visitId = $("#visitId").val();
var name = $("#name").val();
var deptName = $("#deptName").val();
var deptName = getDeptNameForQuery();
var startDateTo = $("#startDateTo").val();
var endDateTo = $("#endDateTo").val();
var isSearch = $("#isSearch").val();

@ -14,7 +14,31 @@ function setFormToken(){
})
}
//加载科室
//flag=1显示全部科室 flag=2显示过滤科室
function getDept() {
//获取科室列表
$.ajax({
url: path+"/inHosp/getDept",
type: "POST",
data: {effective: 1, typecode: "dept_code"},
success: function (result) {
if (result != null) {
var html = '';
for (var i = 0; i < result.length; i++) {
var name = result[i].name;
var py = makePy(name);
var pingyin = ConvertPinyin(name);
html += '<option data-tokens="' + name + '|' + py[0] + '|' + pingyin + '" value="' + result[i].code + '">' + name + '</option>';
}
$("#deptName").append(html);
$("#deptAdmissionTo").append(html);
}
$(".selectpicker").selectpicker('refresh'); //
}
});
}
//加载权限科室
function getPowerDept() {
//获取科室列表
$.ajax({
url: path+"/inHosp/getDept",
@ -44,10 +68,19 @@ function getDept() {
$("#deptName").append(html);
$("#deptAdmissionTo").append(html);
}
$(".selectpicker").selectpicker('refresh'); //
$(".selectpicker").selectpicker('refresh');
}
});
}
//列表根据科室查询逻辑方法
function getDeptNameForQuery(){
var deptAdmissionTo = localStorage.getItem($("#userId").val()+"_depts");
var deptName = $("#deptName").val();
if(deptName.length > 0){
deptAdmissionTo = deptName.toString();
}
return deptAdmissionTo;
}
//键盘回车查询
$(document).keyup(function(event){
if(event.keyCode ==13){

@ -233,7 +233,8 @@ function initTable() {
}
$(function () {
getDept();
//加载权限科室
getPowerDept();
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
if (index != null && index != "" && index.indexOf("excel") != -1) {

@ -1,12 +1,3 @@
//列表根据科室查询逻辑方法
function getDeptNameForQuery(){
var deptAdmissionTo = localStorage.getItem("depts");
var deptName = $("#deptName").val();
if(deptName.length > 0){
deptAdmissionTo = deptName.toString();
}
return deptAdmissionTo;
}
//校验完整性
function checkSuccessMethod(masterId){
var returnStr = '';
@ -23,7 +14,48 @@ function checkSuccessMethod(masterId){
});
return returnStr;
}
//加载科室内主管医生列表
function loadDoctorInCharge(){
var deptName = getDeptNameForQuery();
$.ajax({
type:'get',
url:path+'/beHosp/loadDoctorInCharge',
data:{deptName:deptName},
success:function(data){
$("#doctorInCharge").empty();
if(data.code == 100){
var html = '';
var list = data.extend.list;
if(list != null && list != ''){
for (var i = 0; i < list.length; i++) {
var name = list[i].doctorInCharge;
var py = makePy(name);
var pingyin = ConvertPinyin(name);
html += '<option data-tokens="' + name + '|' + py[0] + '|' + pingyin + '" value="' + name + '">' + name + '</option>';
}
}
$("#doctorInCharge").append(html);
}
$(".selectpicker").selectpicker('refresh');
}
})
}
//根据多选下拉框id获取多选下拉框选中的值
function getSelecteds(id){
var arr = $("#"+id).val();
var values = '';
if(arr != undefined && arr.length > 0){
for (var i = 0; i < arr.length; i++) {
if(arr[i] != ''){
if(values != ''){
values += ',';
}
values += "'" + arr[i] + "'";
}
}
}
return values;
}
//退回按钮
function returnInfo(status,targetCode,id){
//重新生成formToken
@ -176,7 +208,6 @@ var files = new Array();
var id = 0;
//图片处理相关代码
$(function () {
getDept();
initTable();
});

@ -3,6 +3,10 @@ var tipLoad = 1;
//定义表格内容最大高度
var maxHeight = 0;
$(function () {
//加载主管医生列表
loadDoctorInCharge();
//加载权限科室
getPowerDept();
getChecker();
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
@ -111,7 +115,7 @@ function initTable() {
startDateTo: $("#startDateTo").val(),
endDateTo: $("#endDateTo").val(),
deptAdmissionTo: getDeptNameForQuery(),
doctorInCharge: $("#doctorInCharge").val(),
doctorInCharge: getSelecteds('doctorInCharge'),
isSearch: $("#isSearch").val()
};
return temp;
@ -274,33 +278,13 @@ function initTable() {
//导出excel功能
$("#excelBtn").click(function () {
var doctorInCharge = $("#doctorInCharge").val();
var doctorInCharge = getSelecteds("doctorInCharge");
var inpNo = $("#inpNo").val();
var visitId = $("#visitId").val();
var name = $("#name").val();
var startDateTo = $("#startDateTo").val();
var endDateTo = $("#endDateTo").val();
var url = window.location.href;
var deptAdmissionTo = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
var len = ($("#deptName").val()).length;
if (len > 0) {
var deptName = $("#deptName").val();
if (deptName.indexOf("") != -1) {
if (deptAdmissionTo != null && deptAdmissionTo != '') {
deptAdmissionTo += "," + $("#deptAdmissionTo").val();
} else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
deptAdmissionTo = $("#deptAdmissionTo").val();
}
} else {
deptAdmissionTo = $("#deptName").val().toString();
}
} else {
if (deptAdmissionTo != null && deptAdmissionTo != '') {
deptAdmissionTo += "," + $("#deptAdmissionTo").val();
} else if ($("#deptAdmissionTo").val() != null && $("#deptAdmissionTo").val() != '') {
deptAdmissionTo = $("#deptAdmissionTo").val();
}
}
var deptAdmissionTo = getDeptNameForQuery();
var isSearch = $("#isSearch").val();
var url = path+"/inHosp/exportExcel";
post(url, {
@ -309,7 +293,6 @@ $("#excelBtn").click(function () {
"visitId": visitId,
"name": name,
"deptAdmissionTo": deptAdmissionTo,
"deptName": deptName,
"startDateTo": startDateTo,
"endDateTo": endDateTo,
"isSearch": isSearch

@ -550,6 +550,8 @@ $("#getRecallBtn").on('click', function () {
});
$(function () {
//加载科室
getDept();
$(".modal-dialog").draggable();//为模态对话框添加拖拽
//日期控件
var url = window.location.href;

@ -2,6 +2,7 @@ var tipLoad = 1;
//定义表格内容最大高度
var maxHeight = 0;
$(function () {
//加载科室
getDept();
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");

@ -2,6 +2,8 @@ var tipLoad = 1;
//定义表格内容最大高度
var maxHeight = 0;
$(function () {
//加载科室
getDept();
getChecker();
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");

Loading…
Cancel
Save