更新版本20201113

master
zengwh 5 years ago
parent e62c4d708c
commit f0a0417008

@ -23,8 +23,6 @@ import java.util.List;
public class ArchiveOtherExtController {
@Autowired
private ArchiveOtherExtService archiveOtherExtService;
@Autowired
private ArchiveOtherService archiveOtherService;
/**
*
* @param offset
@ -96,9 +94,9 @@ public class ArchiveOtherExtController {
* @return
* @throws Exception
*/
@RequestMapping("selectSuccessByExtIds")
@RequestMapping("selectAllByIdsAndSubmitTime")
@ResponseBody
public Msg selectSuccessByExtIds(String ids,String c1) throws Exception{
public Msg selectSuccessByExtIds(String ids) throws Exception{
if(StringUtils.isNotBlank(ids)){
String[] split = ids.split(",");
StringBuilder temp = new StringBuilder();
@ -110,7 +108,7 @@ public class ArchiveOtherExtController {
temp.append("'").append(str).append("'");
}
}
List<ArchiveOther> list = archiveOtherService.selectAllByC2(temp.toString(),c1);
List<ArchiveOther> list = archiveOtherExtService.selectAllByIdsAndSubmitTime(temp.toString());
return Msg.success().add("list",list);
}else{
return Msg.fail("参数ids不能为空");

@ -22,6 +22,7 @@ import com.emr.vo.ArchiveFlowInfoVo;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.endpoint.Client;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
@ -32,6 +33,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -53,9 +55,10 @@ public class beHospitaledController {
@Autowired
private EmrOvertimeSetService emrOvertimeSetService;
@RequestMapping(value = "/beHosps")
public String inHospitals(Integer flag,Model model){
public String inHospitals(Integer flag,Integer infoId,Model model){
if(null != flag){
model.addAttribute("flag",flag);
model.addAttribute("infoId",infoId);
model.addAttribute("overDateSet",overDateSet);
//获取超期提醒日期
String remindDate = emrOvertimeSetService.getRemindDate();
@ -119,7 +122,15 @@ public class beHospitaledController {
public Msg getFlowRole() throws Exception{
//查询审核角色集合根据有效进行计算状态code
List<ArchiveFlowRole> archiveFlowRoles = flowRoleMapper.selectAll();
return Msg.success().add("list",archiveFlowRoles);
List<ArchiveFlowRole> list = new ArrayList<>();
if(!CollectionUtils.isEmpty(archiveFlowRoles)){
for(ArchiveFlowRole obj : archiveFlowRoles){
if(null != obj.getStepIndex() && null != obj.getRole()){
list.add(obj);
}
}
}
return Msg.success().add("list",list);
}
@ResponseBody

@ -75,6 +75,8 @@ public class lastVerifyController {
archiveMasterVo.setEndDateTo(null);
}
try {
//是否查询纸质签收状态的相关处理
archiveMasterService.setLastVerifyList(archiveMasterVo);
OffsetLimitPage offsetLimitPage = archiveMasterService.selectByLast(archiveMasterVo, offset, limit);
return offsetLimitPage;
} catch (Exception e) {
@ -96,6 +98,8 @@ public class lastVerifyController {
String tableThNames = "住院号,住院次数,名字,性别,出院科室,出院日期,主管医生,状态";
String fieldCns = "inpNo,visitId,name,sex,deptName,dischargeDateTime,doctorInCharge,status";
try {
//是否查询纸质签收状态的相关处理
archiveMasterService.setLastVerifyList(archiveMasterVo);
//构造excel的数据
List<Archive_Master_Vo> list = archiveMasterService.selectLastVerifyList(archiveMasterVo);

@ -1,5 +1,6 @@
package com.emr.dao;
import com.emr.entity.ArchiveOther;
import com.emr.entity.ArchiveOtherExt;
import com.emr.vo.ArchiveOtherExtVo;
import org.apache.ibatis.annotations.Param;
@ -24,4 +25,11 @@ public interface ArchiveOtherExtMapper {
List<ArchiveOtherExtVo> selectAllByIds(@Param("ids") String ids);
//int updateSubmit(@Param("ids")String ids);
/**
* ids
* @param ids
* @return
*/
List<ArchiveOther> selectAllByIdsAndSubmitTime(@Param("ids")String ids);
}

@ -53,4 +53,6 @@ public interface Archive_MasterMapper {
List<Archive_Master> loadDoctorInCharge(@Param("deptName") String deptName);
List<Archive_Master> loadOverTimeDoctorInCharge();
List<Archive_Master> selectPatientIdsForSign();
}

@ -55,6 +55,10 @@ public class Archive_Master_Vo extends Archive_Master{
private String doctorInChargeCode;//主管医生工号
private String userName;//登录用户
private Integer isSign;//是否查询纸质签收状态
private List<String> patientIdsForSign;//已纸质签收集合
}

@ -118,9 +118,13 @@ public interface Archive_MasterService {
List<Archive_Master_Vo> selectLastVerifyList(Archive_Master_Vo archiveMasterVo);
Archive_Master_Vo setLastVerifyList(Archive_Master_Vo vo);
List<Archive_Master> loadDoctorInCharge(String deptName);
List<Archive_Master> loadOverTimeDoctorInCharge();
List<String> selectOracleGetSignList(StringBuilder patientIdStr, List<String> selectList);
}

@ -294,4 +294,13 @@ public class ArchiveOtherExtService {
archiveOtherExtSubmittimeMapper.createInfo(createList);
}
}
/**
* ids
* @param ids
* @return
*/
public List<ArchiveOther> selectAllByIdsAndSubmitTime(String ids) {
return archiveOtherExtMapper.selectAllByIdsAndSubmitTime(ids);
}
}

@ -27,7 +27,6 @@ import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@ -190,6 +189,39 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
return new OffsetLimitPage((Page) list);
}
/**
*
* @param vo
* @return
*/
@Override
public Archive_Master_Vo setLastVerifyList(Archive_Master_Vo vo) {
if(null != vo.getIsSign()){
//查询护士长已审核与召回病历记账号集合
List<Archive_Master> masters = archiveMasterMapper.selectPatientIdsForSign();
//处理记账号返回字符串
StringBuilder patientIds = new StringBuilder();
if(!CollectionUtils.isEmpty(masters)){
for(Archive_Master master : masters){
if(StringUtils.isNotBlank(master.getPatientId())){
if(StringUtils.isNotBlank(patientIds)){
patientIds.append(",");
}
patientIds.append("'").append(master.getPatientId()).append("'");
}
}
}
//将查询结果带入查询oracle返回集合
List<String> selectList = new ArrayList<>();
//selectList.add("1304063");
//selectList.add("1304458");
selectList = selectOracleGetSignList(patientIds,selectList);
//设置进查询条件
vo.setPatientIdsForSign(selectList);
}
return vo;
}
/**
*
* */
@ -236,28 +268,21 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//赋值纸质扫描上传情况
List<Archive_Detail> details = detailMapper.selectIsScan(patientIdStr.toString(),1);
//赋值签收情况
//查询签收情况
String sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" +
"and freg_date is not null";
List<String> selectList = new ArrayList<>();
try{
//执行查询
List<String> selectList = new ArrayList<>();
try{
selectList = OracleConnect.selectList(sql);
}catch (Exception e){
e.printStackTrace();
ExceptionPrintUtil.printException(e);
}
selectList = selectOracleGetSignList(patientIdStr, selectList);
for (Archive_Master_Vo masterVo : list) {
masterVo.setRemark("未签收");
//赋值
if(!CollectionUtils.isEmpty(selectList)){
String patientId = masterVo.getPatientId();
if(StringUtils.isNotBlank(patientId)) {
for (String str : selectList) {
if(str.equals(patientId)){
masterVo.setRemark("已签收");
break;
if(null == archiveMasterVo.getIsSign()) {
masterVo.setRemark("未签收");
//赋值
if (!CollectionUtils.isEmpty(selectList)) {
String patientId = masterVo.getPatientId();
if (StringUtils.isNotBlank(patientId)) {
for (String str : selectList) {
if (str.equals(patientId)) {
masterVo.setRemark("已签收");
break;
}
}
}
}
@ -397,14 +422,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
for (Archive_Master_Vo vo:list) {
//转换总费用d1
BigDecimal d1 = vo.getD1();
if(d1 != null) {
java.text.DecimalFormat myformat=new java.text.DecimalFormat("0.00");
String d1Str = myformat.format(d1);
}else{
vo.setD1(new BigDecimal(0));
}
//科室名称编码转名称
deptNameCode2Name(dictionaries, vo);
//赋值出院天数
@ -1123,6 +1140,29 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
}
return null;
}
/**
* oracle
* @param patientIdStr
* @return
*/
@Override
public List<String> selectOracleGetSignList(StringBuilder patientIdStr, List<String> selectList){
//查询签收情况
String sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" +
"and freg_date is not null";
//执行查询
try{
long start = System.currentTimeMillis();
selectList = OracleConnect.selectList(sql);
long end = System.currentTimeMillis();
log.info("查询oracle的纸质病历签收集合使用时间:"+(end-start)/1000+"s");
}catch (Exception e){
e.printStackTrace();
ExceptionPrintUtil.printException(e);
}
return selectList;
}
}

@ -252,7 +252,7 @@ public class EmrOvertimeSetService {
//获取提前超期天数
Integer surplusDays = emrOvertimeSet.getSurplusDays();
if(workDateList.size() >= surplusDays){
return workDateList.get(surplusDays).getDate();
return workDateList.get(emrOvertimeSet.getDays() - surplusDays + 1).getDate();
}
}
return null;

@ -104,7 +104,7 @@ public class RecordService {
public SubmitRecordStatistics selectCount(RecordSearch recordSearch) {
SubmitRecordStatistics record = recordMapper.selectCount(recordSearch);
//计算百分比并赋值
SetStatisticsPercent(record);
setStatisticsPercent(record);
return record;
}
@ -128,7 +128,7 @@ public class RecordService {
if(!CollectionUtils.isEmpty(list)){
for (SubmitRecordStatistics obj:list) {
//计算百分比并赋值
SetStatisticsPercent(obj);
setStatisticsPercent(obj);
obj.setDeptNameCn(deptNameCn);
}
}
@ -139,7 +139,7 @@ public class RecordService {
*
* @param record
*/
private void SetStatisticsPercent(SubmitRecordStatistics record) {
private void setStatisticsPercent(SubmitRecordStatistics record) {
Integer count = record.getAllCount();
if (count != 0) {
record.setCount1Percent(Math.round(record.getCount1() * 100 / count) + "%");

@ -145,14 +145,15 @@ public class SendMessageService {
}
//获取角色名称与角色称呼、infoId
List<String> roleList = selectInfoIdAndRoleName(user.getRoleId());
recordSearch.setInfoId(Integer.valueOf(roleList.get(2)));
int infoId = Integer.valueOf(roleList.get(2));
recordSearch.setInfoId(infoId);
//查询该用户即将到期的待审核病历数
int count = recordMapper.selectCountOverTimeByRoleId(recordSearch);
if(count > 0) {
//组织通知内容 XXX医生或护士您有X份病历是XX角色待审核状态请及时查阅
String content = selectContentByRole(user.getUserPosition(), count, roleList);
//调用权限系统发送消息接口
sendMessage(user.getUserId(), content,"sendOverTimeMessage");
sendMessage(user.getUserId(), content,"sendOverTimeMessage_"+infoId);
}
}
}

@ -56,4 +56,9 @@ public class RecordSearch {
*
*/
private Integer surplus;
/**
*
*/
private Integer isPaperSign;
}

@ -2,7 +2,7 @@
#POWER_IP = 192.168.1.3
#POWER_PORT = 8081
POWER_IP = 200.100.104.40
POWER_IP = 200.100.104.43
POWER_PORT = 8081
#power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934

@ -524,4 +524,15 @@
</if>
</where>
</update>-->
</mapper>
<!--根据ids字段的查询与同步更新比较时间比较较晚时间的集合-->
<select id="selectAllByIdsAndSubmitTime" resultMap="BaseResultMap">
SELECT
archive_other_ext.ID
FROM
archive_other_ext
INNER JOIN archive_other_ext_submitTime ON archive_other_ext.ID = archive_other_ext_submitTime.other_ext_id
WHERE
eTime > create_time
AND archive_other_ext.ID IN ( ${ids} )
</select>
</mapper>

@ -219,6 +219,10 @@
<!--不带科室的出院条件查询-->
<sql id="beHospitalSeach1">
and ArchiveState != '1024' and ArchiveState != '128' and YEAR(discharge_date_time) != '1801'
/**根据待审核节点查询*/
<include refid="selectByInfo"></include>
/**根据审核状态查询*/
<include refid="selectByStatus"></include>
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
@ -389,19 +393,19 @@
<choose>
<!--医生-->
<when test="status == 2">
AND ArchiveState IN ('2','18','50','514','6','22','54','518','14','30','526','64','1024')
AND ArchiveState IN ('2','18','50','514','768','6','22','54','518','14','30','62','526','64','1024')
</when>
<when test="status == 3">
AND ArchiveState IN ('6','22','54','518','14','30','526','64','1024')
AND ArchiveState IN ('6','22','54','518','14','30','62','526','64','1024')
</when>
<when test="status == 4">
AND ArchiveState IN ('14','30','526','64','1024')
AND ArchiveState IN ('14','30','62','526','64','1024')
</when>
<when test="status == 5">
AND ArchiveState IN ('16','18','22','40','528','48','50','54','304','64','1024')
AND ArchiveState IN ('16','18','22','40','528','768','48','50','54','62','304','64','1024')
</when>
<when test="status == 6">
AND ArchiveState IN ('48','50','54','304','64','1024')
AND ArchiveState IN ('48','50','54','62','304','64','1024')
</when>
<when test="status == 7">
AND ArchiveState IN ('64')
@ -497,7 +501,28 @@
days
END from emr_overtime_set where id = 1) days
from archive_master m
where 1=1 and (ArchiveState = '64' or ArchiveState = '1024')
where 1=1 and ArchiveState in ('64','1024')
<!--查询纸质签收状态-->
<if test="isSign != null">
and patient_id
<choose>
<!--已签收-->
<when test="isSign == 1">
in
</when>
<otherwise>
not in
</otherwise>
</choose>
(
<choose>
<when test="patientIdsForSign != null">
<foreach collection="patientIdsForSign" item="item" separator=",">#{item}</foreach>
</when>
<otherwise>'无效'</otherwise>
</choose>
)
</if>
<if test="id != null and id != ''">
and m.id = #{id,jdbcType=NVARCHAR}
</if>
@ -555,7 +580,6 @@
and m.admission_date_time &lt;= #{endDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
<if test="checkDoctor != null">
and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR}
</if>
@ -1152,4 +1176,9 @@
ORDER BY
DOCTOR_IN_CHARGE
</select>
<!--查询需要查询纸质状态的记账号集合-->
<select id="selectPatientIdsForSign" resultMap="BaseResultMap">
select patient_id from archive_master where ArchiveState in ('64','1024')
order by discharge_date_time desc
</select>
</mapper>

@ -256,7 +256,12 @@
) allCount,
( SELECT COUNT( 1 ) FROM archive_master WHERE (ArchiveState = '64' or ArchiveState = '128' or ArchiveState = '1024') <include refid="selectByDate"></include>
) count1,
( SELECT COUNT( 1 ) FROM archive_master WHERE ArchiveState = '128' <include refid="selectByDate"></include>
( SELECT COUNT( 1 ) FROM archive_master WHERE ArchiveState = '128'
<!--是否视纸质病历签收为已归档或查护士长已审核状态码64-->
<if test="isPaperSign != null">
OR ArchiveState = '64'
</if>
<include refid="selectByDate"></include>
) count2,
(
SELECT

@ -46,7 +46,7 @@
}
}
//跳转到出院浏览待审核页面
function returnUnSubmitPage(){
function returnUnSubmitPage(infoId){
var url = '';
//获取登录者角色id
var roleId = $("#roleId").val();
@ -55,7 +55,7 @@
url = path + "/lastVerify/lastVerifys?flag=1";
}else{
//其余跳转出院浏览
url = path + "/beHosp/beHosps?flag=1";
url = path + "/beHosp/beHosps?flag=1&infoId="+infoId;
}
$("#iFrame1").prop("src",url);
}
@ -91,9 +91,10 @@
buttons: [{
text: '查看详情',
click: function (e) {
if(typeFlag == 'sendOverTimeMessage') {
if(typeFlag.indexOf('sendOverTimeMessage') != -1) {
var infoId = typeFlag.split("_")[1];
//跳转归档系统待审核页面
returnUnSubmitPage();
returnUnSubmitPage(infoId);
}else{
//跳转权限系统读取通知页面
noticeManage1(typeFlag);

@ -146,6 +146,8 @@
<input type="hidden" id="checker">
<!--查询审核节点的支线-->
<input type="hidden" id="searchOperRole">
<!--角色id-->
<input type="hidden" id="roleId" value="${CURRENT_USER.roleId}">
<div class="mainBody">
<div class="main">
<div class="headDiv">
@ -207,11 +209,11 @@
<option value="0">否</option>
</select>
</div>
<%--<div class="form-group divCss">
<div class="form-group divCss">
<label>审核状态:</label>
<select class="input-sm form-control" id="archivestate1">
<option value="">全部</option>
<option value="0" <c:if test="${flag == 1}">selected</c:if>>待审核</option>
<option value="0">待审核</option>
<option value="1">已审核</option>
</select>
</div>
@ -219,15 +221,15 @@
<label>待审核节点:</label>
<select class="form-control input-sm" id="infoId">
<option value="">全部</option>
<option value="2">医生提交</option>
<option value="3">医生质控员质控</option>
<option value="4">科主任审核</option>
<option value="5">护士提交</option>
<option value="6">护士质控员质控</option>
<option value="7">护士长审核</option>
<option value="8">病案室审核</option>
<option value="2" <c:if test="${infoId == 2}">selected</c:if>>医生提交</option>
<option value="3" <c:if test="${infoId == 3}">selected</c:if>>医生质控员质控</option>
<option value="4" <c:if test="${infoId == 4}">selected</c:if>>科主任审核</option>
<option value="5" <c:if test="${infoId == 5}">selected</c:if>>护士提交</option>
<option value="6" <c:if test="${infoId == 6}">selected</c:if>>护士质控员质控</option>
<option value="7" <c:if test="${infoId == 7}">selected</c:if>>护士长审核</option>
<option value="8" <c:if test="${infoId == 8}">selected</c:if>>病案室审核</option>
</select>
</div>--%>
</div>
<button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
<button type="button" class="btn btn-primary btn-sm divCss" id="approvesBtn">批量审核</button>
@ -274,7 +276,7 @@
<form class="form-horizontal" id="form1">
<!--记账号-->
<input id="patientId" type="hidden">
<div id="masterId"></div>
<input id="masterId" hidden></input>
<div class="row">
<div class="row divCss3">病历信息</div>
<div class="row divCss2">
@ -825,7 +827,7 @@
</div>
</div>
</body>
<script src="${path}/static/js/beHospList/beHospList.js?time=2020-11-11"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-11"></script>
<script src="${path}/static/js/beHospList/beHospList.js?time=2020-11-13"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-13"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
</html>

@ -355,7 +355,7 @@
</div>
<footer class="main-footer">
<div class="pull-right">
<b>Version</b> 20201111
<b>Version</b> 20201113
</div>
<strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
reserved.
@ -400,6 +400,6 @@
</div>
</div>
<%@ include file="/WEB-INF/jspf/webSocket.jspf" %>
<script src="${path}/static/js/index.js?time=2020-11-10"></script>
<script src="${path}/static/js/index.js?time=2020-11-13"></script>
</body>
</html>

@ -177,6 +177,14 @@
onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
</select>
</div>
<div class="form-group divCss">
<label>纸质状态:</label>
<select class="form-control input-sm" id="isSign">
<option value="">全部</option>
<option value="1">已签收</option>
<option value="0">未签收</option>
</select>
</div>
<button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
<button type="button" class="btn btn-primary btn-sm divCss" id="approvesBtn">批量审核</button>
@ -646,8 +654,8 @@
</div>
</div>
</body>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-10-13"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-11"></script>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-11-13"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-13"></script>
<script src="${path}/static/js/statistics/getDeptCommom.js"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
</html>

@ -8,6 +8,7 @@ function initTable() {
if (tipLoad == 1) {
$("#table").bootstrapTable({ // 对应table标签的id
url: path+"/beHosp/beHospList", // 获取表格数据的url
uniqueId:"id",
contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求注释掉这句话也能拿到数据
cache: false, // 设置为 false 禁用 AJAX 数据缓存, 默认为true
striped: true, //是否显示行间隔色
@ -670,7 +671,7 @@ function getCurrentCodes() {
$.ajaxSettings.async = true;
}
}
/*//加载审核节点
//加载审核节点
function getApproveRoles() {
//只做一次查询赋值
$.get(path+"/beHosp/getFlowRole",function(data){
@ -678,8 +679,7 @@ function getApproveRoles() {
var flowRoles = data.extend.list;
if(null != flowRoles && flowRoles != ''){
var html = '';
//获取拥有角色
var currentRoleIds = $("#currentRoleIds").val();
var currentRoleIds = selectMaxInfoId($("#currentRoleIds").val());
//获取操作角色
var checker = $("#checker").val();
for (var i = 0; i < flowRoles.length; i++) {
@ -688,7 +688,7 @@ function getApproveRoles() {
//过滤病案室审核128和病案室召回1024且无效的对象
if(code != '128' && code != '1024' && flowRoles[i].effective == 1){
if(code <= 64 && code >= 2 && checker != 4){
if(currentRoleIds != '' && currentRoleIds > flowRoles[i].id && checker == flowRoles[i].role){
if(currentRoleIds != '' && currentRoleIds >= flowRoles[i].id && checker == flowRoles[i].role){
html += option;
}
}else{
@ -708,7 +708,21 @@ function getApproveRoles() {
toastr.error(data.msg);
}
},'json')
}*/
}
//取最大的审核审核id
function selectMaxInfoId(ids){
var temp = 0;
var idArr = ids.split(',');
for (var i = 0; i < idArr.length; i++) {
if(idArr[i] != ''){
if(temp < idArr[i]){
temp = idArr[i];
}
}
}
return temp;
}
//监听审核节点查询的变更事件,记录属于支线
$("#infoId").change(function(){
@ -813,12 +827,17 @@ $("#checkSuccessBtn").click(function(){
var masterId = $("#masterId").val();
var result = checkSuccessMethod(masterId);
if(result != ''){
//刷新表格
//$('#table').bootstrapTable('refresh');
$("#wzContent").text(result);
//增加完整性刷新后高亮状态
$("#wzContent").addClass("wzContent");
toastr.success("完整性状态已刷新");
//刷新表格
$('#table').bootstrapTable('updateByUniqueId', {
id: masterId,
row: {
lockinfo: result
}
});
}else{
toastr.warning("校验失败,校验程序未启动或出错!");
}

@ -35,7 +35,7 @@ function loadDoctorInCharge(){
var selected = '';
//判断是否需要选中
var flag = $("#flag").val();
var currentRole = $("#currentRole").val();
var currentRole = $("#roleId").val();
if(flag == 1 && currentRole == 1){
if($("#currentName").val() == name){
selected = 'selected';
@ -1041,8 +1041,8 @@ $("#saveBtn").click(function () {
});
});
$("#workDetail").click(function(){
//隐藏加载控件
$("#loading").hide();
//撤销监听
cancleListentingSuccess();
$("#workDetailModal").modal({
show: true//弹出对话框
});
@ -1056,7 +1056,7 @@ $("#workDetail").click(function(){
initTable5(data,'client');
},
error:function(data){
console.log('查询出错了')
console.log('查询出错了')
}
})
})
@ -1208,7 +1208,15 @@ function initTable5(data,sidePagination) {
title: '标题',
field: 'c1',
align: 'left',
valign: 'middle'
valign: 'middle',
formatter: function (value, row, index) {
var sysFlag = row.sysflag;
if(null != sysFlag && sysFlag == 8){
return '长临医嘱';
}else{
return value;
}
}
},
{
title: '最近更新',
@ -1328,8 +1336,51 @@ var times = 5;
$("#loading").css("background","url("+path+"/static/img/load.gif) no-repeat 10px 50%");
//同步更新
var timeInterval;
//定义需要监听采集成功与否的otherId集合
var otherExtIds = '';
//记录需要监听的数据
function addListentingData(ids){
//添加不重复的id
if(ids != ''){
if(otherExtIds != ''){
var otherExtIdsArr = otherExtIds.split(",");
var idsArr = ids.split(",");
for (var i = 0; i < idsArr.length; i++) {
//定义是否存在
var existIdFlag = false;
for (var j = 0; j < otherExtIdsArr.length; j++) {
if(idsArr[i] != '' && otherExtIdsArr[j] != ''){
if(idsArr[i] == otherExtIdsArr[j]){
existIdFlag = true;
break;
}
}
}
//存在则添加
if(!existIdFlag){
otherExtIds += ',' + idsArr[i];
}
}
}else{
otherExtIds = ids;
}
}
}
//撤销监听
function cancleListentingSuccess(){
//隐藏加载控件
$("#loading").hide();
clearInterval(timeInterval);
otherExtIds = '';
}
//提交同步采集
function submitUpdate(ids,notNursingIds,detailIds,sysFlag) {
var idsArr = ids.split(",");
//记录需要监听的数据
addListentingData(ids);
//撤销定时
clearInterval(timeInterval);
var jzh = $("#patientId").val();
$.ajax({
type:'post',
@ -1337,58 +1388,32 @@ function submitUpdate(ids,notNursingIds,detailIds,sysFlag) {
data:{ids:ids,notNursingIds:notNursingIds,detailIds:detailIds,jzh:jzh,masterId:$("#idLab").text(),sysFlag:sysFlag},
dataType:'json',
success:function (data) {
debugger
if(data.code == 100){
toastr.success("同步更新已发送,请耐心等待!");
//刷新列表
initTable5('','server');
$("#loading").show();
var timeInterval = setInterval(function () {
//定义成功个数
var successCount = 0;
//10秒查询一次
if(sysFlag == 1){
//护理记录
$.ajax({
type:'get',
url:path+'/font/selectC1ByPatientId',
data:{patientId:jzh},
dataType:'json',
async:false,
success:function(result){
if(result.code == 100){
successCount = 1;
}
}
})
}
//定义需要查询的other_ext_id集合
var idsTemp = '';
if(sysFlag == 1){
//存在护理
idsTemp = notNursingIds;
}else{
//不存在护理
idsTemp = ids;
}
if(idsTemp != '') {
timeInterval = setInterval(function () {
if(otherExtIds != '') {
//其他
$.ajax({
type: 'get',
url: path + '/archiveExt/selectSuccessByExtIds',
data: {ids: idsTemp,c1:'done'},
url: path + '/archiveExt/selectAllByIdsAndSubmitTime',
data: {ids: otherExtIds},
dataType: 'json',
async:false,
success: function (result) {
if (result.code == 100) {
var data = result.extend.list.length;
if(successCount == 1 && idsTemp.split(",").length == data){
if(otherExtIds.split(",").length == data){
toastr.success("按需采集全部完成,页面将在" + times + "秒后自动刷新");
setTimeout(function(){
//刷新列表
initTable5('','server');
},times*1000);
//隐藏加载控件
$("#loading").hide();
clearInterval(timeInterval);
//撤销监听
cancleListentingSuccess();
}
}
}

@ -1,6 +1,6 @@
$(document).ready(function () {
//请求后台查询即将过期的待审核份数
//sendMessageForSubmit();
sendMessageForSubmit();
var headerHeight = $(".main-header").height() || 0;
var footerHeight = ($(".main-footer").height() || 0) + 31;
var windowHeight = $(window).height();

@ -72,6 +72,7 @@ function initTable() {
startDateTo: $("#startDateTo").val(),
endDateTo: $("#endDateTo").val(),
doctorInCharge:$("#doctorInCharge").val(),
isSign:$("#isSign").val(),
isSearch:$("#isSearch").val()
};
return temp;
@ -150,6 +151,10 @@ function initTable() {
align: 'center',
valign: 'middle',
formatter: function (value, row) {
var isSign = $("#isSign").val();
if(isSign != '') {
value = isSign == 1 ? '已签收' : '未签收';
}
var colorStr = ''
if(value == '已签收'){
colorStr = '#8FBC8F';
@ -630,5 +635,5 @@ $("#excelBtn").click(function () {
var endDateTo = $("#endDateTo").val();
window.location.href = path+"/lastVerify/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&deptName=" + deptName
+ "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&isSearch="+$("#isSearch").val()+"&doctorInCharge="+$("#doctorInCharge").val();
+ "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo+"&isSearch="+$("#isSearch").val()+"&doctorInCharge="+$("#doctorInCharge").val()+"&isSign="+$("#isSign").val();
});
Loading…
Cancel
Save