diff --git a/doc/gm_record.bak b/doc/gm_record.bak index c2aa3cb..cfb3636 100644 Binary files a/doc/gm_record.bak and b/doc/gm_record.bak differ diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 9032243..f5dbbf2 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -1,12 +1,12 @@ package com.emr.controller; import com.emr.entity.ArchiveOther; -import com.emr.entity.ArchiveOtherExt; import com.emr.entity.OffsetLimitPage; import com.emr.service.ipml.ArchiveOtherExtService; -import com.emr.service.ipml.ArchiveOtherService; import com.emr.util.ExceptionPrintUtil; +import com.emr.util.ExportExcelUtil; import com.emr.util.Msg; +import com.emr.vo.ArchiveForceSumbitInfoVo; import com.emr.vo.ArchiveOtherExtVo; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -14,11 +14,13 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; @Controller @@ -130,4 +132,58 @@ public class ArchiveOtherExtController { String c1s = archiveOtherExtService.selectC1WithNotCollectFinishByPatientId(patientId); return Msg.success().add("c1s",c1s); } + + /** + * 跳转his召回日志 + * @return + */ + @RequestMapping("hisCallBackList") + private String hisCallBackList(){ + return "/vCountDir/hisCallBackList"; + } + + /** + * 获取his召回日志数据 + * @param archiveOtherExtVo + * @param offset + * @param limit + * @return + * @throws Exception + */ + @ResponseBody + @RequestMapping(value = "getHisCallBackList") + public OffsetLimitPage getHisCallBackList(ArchiveOtherExtVo archiveOtherExtVo, Integer offset, Integer limit) throws Exception{ + try { + return archiveOtherExtService.getHisCallBackListLimit(archiveOtherExtVo, offset, limit); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } + + /** + * 导出 + * @param response + * @param archiveOtherExtVo + */ + @ResponseBody + @RequestMapping(value = "/exportExcel") + public void exportExcel(HttpServletResponse response,ArchiveOtherExtVo archiveOtherExtVo){ + String tableThNames = "申请时间,审批时间,住院号,患者姓名,住院次数,出院日期,出院科室,处理状态,开始时间,结束时间,归档状态"; + String fieldCns = "sysupdatetimeStr,t2Str,zyh,c1,visitId,t1Str,deptName,statusFlagStr,stimeStr,etimeStr,n2Str"; + //构造excel的数据 + try { + List list = archiveOtherExtService.getHisCallBackList(archiveOtherExtVo); + //文件名 + String fileName = "HIS退回日志" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; + //ExportExcelUtil + ExportExcelUtil exportExcelUtil = new ExportExcelUtil(); + //导出excel的操作 + exportExcelUtil.expordExcel(tableThNames,fieldCns,list,fileName,response); + }catch (Exception e){ + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + } + } } diff --git a/src/main/java/com/emr/controller/ForceSumbitController.java b/src/main/java/com/emr/controller/ForceSumbitController.java new file mode 100644 index 0000000..1f79c2f --- /dev/null +++ b/src/main/java/com/emr/controller/ForceSumbitController.java @@ -0,0 +1,90 @@ +package com.emr.controller; + +import com.emr.entity.OffsetLimitPage; +import com.emr.service.ipml.ArchiveForceSumbitInfoService; +import com.emr.util.ExceptionPrintUtil; +import com.emr.util.ExportExcelUtil; +import com.emr.util.Msg; +import com.emr.vo.ArchiveForceSumbitInfoVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2021/10/17 9:53 + * @UpdateUser: 曾文和 + * @UpdateDate: 2021/10/17 9:53 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ +@Controller +@RequestMapping("forceSumbit") +public class ForceSumbitController { + @Autowired + private ArchiveForceSumbitInfoService archiveForceSumbitInfoService; + + /** + * 跳转强制提交列表 + * @return + */ + @RequestMapping("forceSumbitList") + private String forSumbitList(){ + return "/vCountDir/forceSumbitList"; + } + + /** + * 获取强制提交列表数据 + * @param archiveForceSumbitInfoVo + * @param offset + * @param limit + * @return + * @throws Exception + */ + @ResponseBody + @RequestMapping(value = "getForceSumbitList") + public OffsetLimitPage getForceSumbitList(ArchiveForceSumbitInfoVo archiveForceSumbitInfoVo, Integer offset, Integer limit) throws Exception{ + try { + return archiveForceSumbitInfoService.getForceSumbitList(archiveForceSumbitInfoVo, offset, limit); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } + + /** + * 导出 + * @param response + * @param archiveForceSumbitInfoVo + */ + @ResponseBody + @RequestMapping(value = "/exportExcel") + public void exportExcel(HttpServletResponse response,ArchiveForceSumbitInfoVo archiveForceSumbitInfoVo){ + String tableThNames = "住院号,住院次数,姓名,出院科室,出院日期,操作节点,操作人工号,操作人姓名,操作时间,缺失信息,状态"; + String fieldCns = "inpNo,visitId,name,deptName,dischargeDateTime,operNodeCode,creater,createrName,createTimeStr,lockInfo,stateCode"; + //构造excel的数据 + try { + List list = archiveForceSumbitInfoService.getList(archiveForceSumbitInfoVo); + //文件名 + String fileName = "强制提交质控列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; + //ExportExcelUtil + ExportExcelUtil exportExcelUtil = new ExportExcelUtil(); + //导出excel的操作 + exportExcelUtil.expordExcel(tableThNames,fieldCns,list,fileName,response); + }catch (Exception e){ + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/emr/controller/WorkHomeController.java b/src/main/java/com/emr/controller/WorkHomeController.java index 2ffacf2..eb9e992 100644 --- a/src/main/java/com/emr/controller/WorkHomeController.java +++ b/src/main/java/com/emr/controller/WorkHomeController.java @@ -7,6 +7,7 @@ import com.emr.service.ipml.RecordService; import com.emr.service.ipml.WorkHomeService; import com.emr.util.ExceptionPrintUtil; import com.emr.util.ExportExcelUtil; +import com.emr.vo.ArchiveOtherExtVo; import com.emr.vo.NotSubmitRecordVo; import com.emr.vo.RecordSearch; import com.emr.vo.ServerMachineVo; @@ -184,8 +185,8 @@ public class WorkHomeController { */ @RequestMapping("callBackStatisticsDetail") @ResponseBody - public OffsetLimitPage callBackStatisticsDetail(Integer offset, Integer limit,String time,String startDateTo,String endDateTo) throws Exception{ - return workHomeService.callBackStatisticsDetail(offset,limit,time,startDateTo,endDateTo); + public OffsetLimitPage callBackStatisticsDetail(Integer offset, Integer limit, ArchiveOtherExtVo archiveOtherExtVo) throws Exception{ + return workHomeService.callBackStatisticsDetail(offset,limit,archiveOtherExtVo); } /** diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index bd15074..461ae4a 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -194,7 +194,10 @@ public class beHospitaledController { @ResponseBody @RequestMapping(value = "/checkSuccess") private String checkSuccessMethod(String archiveDetailId){ - String result = ""; + //查询完整性 + Archive_Master archiveMaster = archiveMasterService.selectByPrimaryKey(archiveDetailId); + return archiveMaster.getLockinfo(); + /* String result = ""; String endpoint = HomepageDictionary; //String endpoint = "http://localhost:8080/ca3/services/caSynrochnized?wsdl"; String method = HomepageMethod; @@ -220,7 +223,7 @@ public class beHospitaledController { client.destroy(); } } - return result; + return result;*/ } diff --git a/src/main/java/com/emr/dao/ArchiveForceSumbitInfoMapper.java b/src/main/java/com/emr/dao/ArchiveForceSumbitInfoMapper.java new file mode 100644 index 0000000..7e6318b --- /dev/null +++ b/src/main/java/com/emr/dao/ArchiveForceSumbitInfoMapper.java @@ -0,0 +1,22 @@ +package com.emr.dao; + +import com.emr.entity.ArchiveForceSumbitInfo; +import com.emr.vo.ArchiveForceSumbitInfoVo; + +import java.util.List; + +public interface ArchiveForceSumbitInfoMapper { + int deleteByPrimaryKey(Long id); + + int insert(ArchiveForceSumbitInfo record); + + int insertSelective(ArchiveForceSumbitInfo record); + + ArchiveForceSumbitInfo selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ArchiveForceSumbitInfo record); + + int updateByPrimaryKey(ArchiveForceSumbitInfo record); + + List getForceSumbitList(ArchiveForceSumbitInfoVo record); +} \ No newline at end of file diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index b6dd5e6..fffe670 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -70,9 +70,8 @@ public interface ArchiveOtherExtMapper { /** * 根据时间查询his召回详情 - * @param time + * @param record * @return */ - List callBackStatisticsDetail(@Param("time") String time,@Param("startDateTo")String startDateTo, - @Param("endDateTo")String endDateTo); + List callBackStatisticsDetail(ArchiveOtherExtVo record); } \ No newline at end of file diff --git a/src/main/java/com/emr/entity/ArchiveForceSumbitInfo.java b/src/main/java/com/emr/entity/ArchiveForceSumbitInfo.java new file mode 100644 index 0000000..b87663b --- /dev/null +++ b/src/main/java/com/emr/entity/ArchiveForceSumbitInfo.java @@ -0,0 +1,106 @@ +package com.emr.entity; + +import java.io.Serializable; +import java.util.Date; + +public class ArchiveForceSumbitInfo implements Serializable { + private Long id; + + private String masterId; + + private String operNodeCode; + + private String creater; + + private String createrName; + + private Date createTime; + + private String lockInfo; + + private String stateCode; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMasterId() { + return masterId; + } + + public void setMasterId(String masterId) { + this.masterId = masterId == null ? null : masterId.trim(); + } + + public String getOperNodeCode() { + return operNodeCode; + } + + public void setOperNodeCode(String operNodeCode) { + this.operNodeCode = operNodeCode == null ? null : operNodeCode.trim(); + } + + public String getCreater() { + return creater; + } + + public void setCreater(String creater) { + this.creater = creater == null ? null : creater.trim(); + } + + public String getCreaterName() { + return createrName; + } + + public void setCreaterName(String createrName) { + this.createrName = createrName == null ? null : createrName.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getLockInfo() { + return lockInfo; + } + + public void setLockInfo(String lockInfo) { + this.lockInfo = lockInfo == null ? null : lockInfo.trim(); + } + + public String getStateCode() { + return stateCode; + } + + public void setStateCode(String stateCode) { + this.stateCode = stateCode == null ? null : stateCode.trim(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", masterId=").append(masterId); + sb.append(", operNodeCode=").append(operNodeCode); + sb.append(", creater=").append(creater); + sb.append(", createrName=").append(createrName); + sb.append(", createTime=").append(createTime); + sb.append(", lockInfo=").append(lockInfo); + sb.append(", stateCode=").append(stateCode); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/service/ipml/ArchiveForceSumbitInfoService.java b/src/main/java/com/emr/service/ipml/ArchiveForceSumbitInfoService.java new file mode 100644 index 0000000..5b23402 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/ArchiveForceSumbitInfoService.java @@ -0,0 +1,86 @@ +package com.emr.service.ipml; + +import com.emr.dao.ArchiveForceSumbitInfoMapper; +import com.emr.entity.ArchiveForceSumbitInfo; +import com.emr.entity.OffsetLimitPage; +import com.emr.entity.Power_User; +import com.emr.service.Archive_MasterService; +import com.emr.util.IDHelper; +import com.emr.util.Msg; +import com.emr.vo.ArchiveForceSumbitInfoVo; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.apache.shiro.util.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2021/10/29 14:31 + * @UpdateUser: 曾文和 + * @UpdateDate: 2021/10/29 14:31 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ +@Service +@Transactional +public class ArchiveForceSumbitInfoService { + @Autowired + private ArchiveForceSumbitInfoMapper archiveForceSumbitInfoMapper; + @Autowired + private Archive_MasterService archiveMasterService; + + public OffsetLimitPage getForceSumbitList(ArchiveForceSumbitInfoVo archiveForceSumbitInfoVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = getList(archiveForceSumbitInfoVo); + return new OffsetLimitPage((Page) list); + } + + public List getList(ArchiveForceSumbitInfoVo archiveForceSumbitInfoVo){ + List list = archiveForceSumbitInfoMapper.getForceSumbitList(archiveForceSumbitInfoVo); + //转换状态 + if(!CollectionUtils.isEmpty(list)){ + Msg role = archiveMasterService.getRole(); + if(null != role) { + for (ArchiveForceSumbitInfoVo vo : list) { + String stateCode = vo.getStateCode(); + Integer status = Integer.valueOf(stateCode); + //组织已经审核的状态 + stateCode = EnumVerify.DocState.GetStepName(status, role.getCode()); + //组织未审核的状态 + //String currentArchivestate = EnumVerify.DocState.GetCurrentStepName(status, role.getCode()); + vo.setStateCode(stateCode); + } + } + } + return list; + } + + public void saveForceSumbit(ArchiveForceSumbitInfo archiveForceSumbitInfo){ + //获取request + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()) + .getRequest(); + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + //获取id + try { + archiveForceSumbitInfo.setId(IDHelper.NewID()); + } catch (Exception e) { + e.printStackTrace(); + } + archiveForceSumbitInfo.setCreater(user.getUserName()); + archiveForceSumbitInfo.setCreaterName(user.getUserPosition()); + archiveForceSumbitInfo.setCreateTime(new Date()); + archiveForceSumbitInfoMapper.insert(archiveForceSumbitInfo); + } +} diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index b168128..c21fb95 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -7,8 +7,12 @@ import com.emr.dao.ArchiveOtherMapper; import com.emr.entity.ArchiveOther; import com.emr.entity.ArchiveOtherExt; import com.emr.entity.ArchiveOtherExtSubmittime; +import com.emr.entity.OffsetLimitPage; +import com.emr.vo.ArchiveForceSumbitInfoVo; import com.emr.vo.ArchiveOtherExtVo; import com.emr.vo.KeyValue; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -376,4 +380,14 @@ public class ArchiveOtherExtService { public void updateOtherDomForStatusFlag(String jzh, String detailIds) { archiveOtherExtMapper.updateOtherDomForStatusFlag(jzh,detailIds,-100); } + + public OffsetLimitPage getHisCallBackListLimit(ArchiveOtherExtVo archiveOtherExtVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = getHisCallBackList(archiveOtherExtVo); + return new OffsetLimitPage((Page) list); + } + + public List getHisCallBackList(ArchiveOtherExtVo archiveOtherExtVo) { + return archiveOtherExtMapper.callBackStatisticsDetail(archiveOtherExtVo); + } } diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 25246e7..f342cdd 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -57,7 +57,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Autowired private PaperPostionService paperPostionService; @Autowired - private TUuPrintMapper tUuPrintMapper; + private ArchiveForceSumbitInfoService archiveForceSumbitInfoService; /** * 在院列表 * */ @@ -937,11 +937,23 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { String[] roleCodes = master.getStatus().split(","); //获取资料完整标识集合 String[] isSuccesses = master.getIsSuccess().split(","); + //获取request for (int i = 0; i < archivestates.length; i++) { if(StringUtils.isNotBlank(archivestates[i])){ //完整或只有一个 if("1".equals(isSuccesses[i]) || ids.length == 1){ updateApprove(ids[i],master.getRemark(), roleArr[i], archiveFlowRoles, archivestates[i], roleCodes[i]); + //插入强制提交的记录 + String lockInfo = master.getLockInfo(); + if(!"完整".equals(lockInfo)){ + //插入强制提交记录 + ArchiveForceSumbitInfo archiveForceSumbitInfo = new ArchiveForceSumbitInfo(); + archiveForceSumbitInfo.setMasterId(master.getId()); + archiveForceSumbitInfo.setLockInfo(lockInfo); + archiveForceSumbitInfo.setOperNodeCode(master.getStatus()); + archiveForceSumbitInfo.setStateCode(master.getArchivestate()); + archiveForceSumbitInfoService.saveForceSumbit(archiveForceSumbitInfo); + } }else{ if(StringUtils.isBlank(masterIds)){ masterIds.append("'").append(ids[i]).append("'"); diff --git a/src/main/java/com/emr/service/ipml/WorkHomeService.java b/src/main/java/com/emr/service/ipml/WorkHomeService.java index 63342c9..ed2f6d5 100644 --- a/src/main/java/com/emr/service/ipml/WorkHomeService.java +++ b/src/main/java/com/emr/service/ipml/WorkHomeService.java @@ -519,12 +519,12 @@ public class WorkHomeService { * HIS退回病案统计数据详情 * @param offset * @param limit - * @param time + * @param archiveOtherExtVo * @return */ - public OffsetLimitPage callBackStatisticsDetail(Integer offset, Integer limit, String time,String startDateTo,String endDateTo) { + public OffsetLimitPage callBackStatisticsDetail(Integer offset, Integer limit,ArchiveOtherExtVo archiveOtherExtVo) { PageHelper.offsetPage(offset, limit); - List list = archiveOtherExtMapper.callBackStatisticsDetail(time,startDateTo,endDateTo); + List list = archiveOtherExtMapper.callBackStatisticsDetail(archiveOtherExtVo); return new OffsetLimitPage((Page) list); } } diff --git a/src/main/java/com/emr/vo/ArchiveForceSumbitInfoVo.java b/src/main/java/com/emr/vo/ArchiveForceSumbitInfoVo.java new file mode 100644 index 0000000..4db5109 --- /dev/null +++ b/src/main/java/com/emr/vo/ArchiveForceSumbitInfoVo.java @@ -0,0 +1,40 @@ +package com.emr.vo; + +/** + * @ProjectName: + * @Description: + * @Param 传输参数 + * @Return + * @Author: 曾文和 + * @CreateDate: 2021/10/29 15:08 + * @UpdateUser: 曾文和 + * @UpdateDate: 2021/10/29 15:08 + * @UpdateRemark: 更新说明 + * @Version: 1.0 + */ + +import com.emr.entity.ArchiveForceSumbitInfo; +import lombok.Data; + +@Data +public class ArchiveForceSumbitInfoVo extends ArchiveForceSumbitInfo { + private String inpNo; + + private Integer visitId; + + private String name; + + private String deptName; + + private String dischargeDateTime; + + private String createTimeStr; + + private String startDate; + + private String endDate; + + private String startDate1; + + private String endDate1; +} diff --git a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java index ccfffed..cf9a0d2 100644 --- a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java +++ b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java @@ -2,6 +2,7 @@ package com.emr.vo; import com.emr.entity.ArchiveOtherExt; import lombok.Data; +import org.apache.ibatis.annotations.Param; /** * @ProjectName: @@ -44,4 +45,26 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt { private String t2Str; private String n2Str; + + private String time; + + private String startDateTo; + + private String endDateTo; + + private String startDateTo1; + + private String endDateTo1; + + private String startDateTo2; + + private String endDateTo2; + + private String inpNo; + + private Integer visitId; + + private String name; + + private String deptName; } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index f29c6a0..976f44b 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -1,10 +1,10 @@ #power\u6743\u9650\u7CFB\u7EDFIP\u548C\u7AEF\u53E3 -#POWER_IP = localhost -#POWER_PORT = 8081 - -POWER_IP = 200.100.104.40 +POWER_IP = localhost POWER_PORT = 8081 +#POWER_IP = 200.100.104.40 +#POWER_PORT = 8081 + #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power diff --git a/src/main/resources/mapper/ArchiveForceSumbitInfoMapper.xml b/src/main/resources/mapper/ArchiveForceSumbitInfoMapper.xml new file mode 100644 index 0000000..941a0e9 --- /dev/null +++ b/src/main/resources/mapper/ArchiveForceSumbitInfoMapper.xml @@ -0,0 +1,202 @@ + + + + + + + + + + + + + + + id, master_id, oper_node_code, creater, creater_name, create_time, lock_info, state_code + + + + delete from archive_force_sumbit_info + where id = #{id,jdbcType=BIGINT} + + + insert into archive_force_sumbit_info (id, master_id, oper_node_code, + creater, creater_name, create_time, + lock_info, state_code) + values (#{id,jdbcType=BIGINT}, #{masterId,jdbcType=NVARCHAR}, #{operNodeCode,jdbcType=NVARCHAR}, + #{creater,jdbcType=NVARCHAR}, #{createrName,jdbcType=NVARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{lockInfo,jdbcType=NVARCHAR}, #{stateCode,jdbcType=NVARCHAR}) + + + insert into archive_force_sumbit_info + + + id, + + + master_id, + + + oper_node_code, + + + creater, + + + creater_name, + + + create_time, + + + lock_info, + + + state_code, + + + + + #{id,jdbcType=BIGINT}, + + + #{masterId,jdbcType=NVARCHAR}, + + + #{operNodeCode,jdbcType=NVARCHAR}, + + + #{creater,jdbcType=NVARCHAR}, + + + #{createrName,jdbcType=NVARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{lockInfo,jdbcType=NVARCHAR}, + + + #{stateCode,jdbcType=NVARCHAR}, + + + + + update archive_force_sumbit_info + + + master_id = #{masterId,jdbcType=NVARCHAR}, + + + oper_node_code = #{operNodeCode,jdbcType=NVARCHAR}, + + + creater = #{creater,jdbcType=NVARCHAR}, + + + creater_name = #{createrName,jdbcType=NVARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + lock_info = #{lockInfo,jdbcType=NVARCHAR}, + + + state_code = #{stateCode,jdbcType=NVARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update archive_force_sumbit_info + set master_id = #{masterId,jdbcType=NVARCHAR}, + oper_node_code = #{operNodeCode,jdbcType=NVARCHAR}, + creater = #{creater,jdbcType=NVARCHAR}, + creater_name = #{createrName,jdbcType=NVARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + lock_info = #{lockInfo,jdbcType=NVARCHAR}, + state_code = #{stateCode,jdbcType=NVARCHAR} + where id = #{id,jdbcType=BIGINT} + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index 1713f76..8451f56 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -716,7 +716,9 @@ CONVERT ( VARCHAR ( 100 ), archive_other_ext.T2, 120 ) t2Str, zyh, archive_other_ext.C1, - CONVERT ( VARCHAR ( 100 ), archive_other_ext.T1, 120 ) t1Str, + CONVERT ( VARCHAR ( 100 ), archive_other_ext.T1, 23 ) t1Str, + visit_id, + emr_dictionary.NAME dept_name, CASE WHEN statusFlag = 0 THEN @@ -737,25 +739,82 @@ END n2Str FROM archive_other_ext - INNER JOIN archive_master ON archive_master.patient_id = archive_other_ext.jzh + INNER JOIN archive_master ON archive_master.patient_id = archive_other_ext.jzh + LEFT JOIN emr_dictionary ON archive_master.dept_name = emr_dictionary.CODE + AND emr_dictionary.parent_id = 'dept_code' WHERE - CONVERT ( VARCHAR ( 100 ), archive_other_ext.T2, 23 ) = #{time} - AND sysFlag = - 300 - + sysFlag = - 300 + + ORDER BY sysUpdateTime DESC - - + + + + AND CONVERT ( VARCHAR ( 100 ), archive_other_ext.T2, 23 ) = #{time} + + + AND zyh LIKE '%' + #{zyh} + '%' + + + AND visit_id = #{visitId} + + + AND archive_other_ext.C1 LIKE '%' + #{c1} + '%' + + + and dept_name in + + #{item} + + - AND discharge_date_time between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and + AND archive_other_ext.T1 between CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) and #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' - AND discharge_date_time >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) + AND archive_other_ext.T1 >= CONVERT(VARCHAR(10),#{startDateTo,jdbcType=NCHAR},120) - AND discharge_date_time <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + AND archive_other_ext.T1 <= #{endDateTo,jdbcType=NCHAR}+ ' 23:59:59' + + + + + AND archive_other_ext.sysUpdateTime between CONVERT(VARCHAR(10),#{startDateTo1,jdbcType=NCHAR},120) and + #{endDateTo1,jdbcType=NCHAR}+ ' 23:59:59' + + + AND archive_other_ext.sysUpdateTime >= CONVERT(VARCHAR(10),#{startDateTo1,jdbcType=NCHAR},120) + + + AND archive_other_ext.sysUpdateTime <= #{endDateTo1,jdbcType=NCHAR}+ ' 23:59:59' + + + AND archive_other_ext.T2 between CONVERT(VARCHAR(10),#{startDateTo2,jdbcType=NCHAR},120) and + #{endDateTo2,jdbcType=NCHAR}+ ' 23:59:59' + + + AND archive_other_ext.T2 >= CONVERT(VARCHAR(10),#{startDateTo2,jdbcType=NCHAR},120) + + + AND archive_other_ext.T2 <= #{endDateTo2,jdbcType=NCHAR}+ ' 23:59:59' + + + + AND statusFlag = #{statusflag} + + + + + AND archive_other_ext.N2 = 1.0000 + + + AND archive_other_ext.N2 != 1.0000 + + + diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf index c529e28..a3807e8 100644 --- a/src/main/webapp/WEB-INF/jspf/comm.jspf +++ b/src/main/webapp/WEB-INF/jspf/comm.jspf @@ -58,6 +58,6 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index c740511..feefb3e 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -677,6 +677,7 @@

是否强制提交?

+ @@ -855,7 +856,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index 724fd74..805d5f1 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -138,7 +138,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp b/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp index 370c91f..43b2a92 100644 --- a/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/flowInfo/flowInfoList.jsp @@ -127,7 +127,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 5399f31..87e0fa0 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -446,7 +446,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 763d556..8069b5b 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -687,7 +687,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/record/deptOverTimeInfo.jsp b/src/main/webapp/WEB-INF/views/record/deptOverTimeInfo.jsp index d440443..7aa1b92 100644 --- a/src/main/webapp/WEB-INF/views/record/deptOverTimeInfo.jsp +++ b/src/main/webapp/WEB-INF/views/record/deptOverTimeInfo.jsp @@ -143,7 +143,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/record/signedRecord.jsp b/src/main/webapp/WEB-INF/views/record/signedRecord.jsp index 29b30b0..2326d6f 100644 --- a/src/main/webapp/WEB-INF/views/record/signedRecord.jsp +++ b/src/main/webapp/WEB-INF/views/record/signedRecord.jsp @@ -129,7 +129,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/record/submitRecord.jsp b/src/main/webapp/WEB-INF/views/record/submitRecord.jsp index deaada0..2abb2be 100644 --- a/src/main/webapp/WEB-INF/views/record/submitRecord.jsp +++ b/src/main/webapp/WEB-INF/views/record/submitRecord.jsp @@ -163,7 +163,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp b/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp index 4e266f7..ff4a812 100644 --- a/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/finalStatisticsDetail.jsp @@ -128,7 +128,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp b/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp index fe74027..061c491 100644 --- a/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/recordStatistics.jsp @@ -135,6 +135,6 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp b/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp index 1d0070a..28e8025 100644 --- a/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/scanCount.jsp @@ -122,7 +122,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp b/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp index f0a6bc6..fc13d0d 100644 --- a/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/statisticsDetail.jsp @@ -128,7 +128,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index a473d3e..3cd17ed 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -587,7 +587,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp index 5a87f99..1b18142 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/doctorFileList.jsp @@ -92,5 +92,5 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/vCountDir/forceSumbitList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/forceSumbitList.jsp new file mode 100644 index 0000000..f14685a --- /dev/null +++ b/src/main/webapp/WEB-INF/views/vCountDir/forceSumbitList.jsp @@ -0,0 +1,161 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + 强制提交病案列表 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + +
+
+
+
+ + 强制提交病案列表 + +
+
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + - + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + - + +
+
+ + +
+
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/vCountDir/hisCallBackList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/hisCallBackList.jsp new file mode 100644 index 0000000..9cb2265 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/vCountDir/hisCallBackList.jsp @@ -0,0 +1,163 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + HIS退回日志 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + +
+
+
+
+ + HIS退回日志 + +
+
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + - + +
+
+
+ +
+ + - + +
+
+
+ +
+ + - + +
+
+
+ + +
+
+ + +
+ + +
+
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp index bc686b8..3dcef8b 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp @@ -129,5 +129,5 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/workHome/callBackStatistics.jsp b/src/main/webapp/WEB-INF/views/workHome/callBackStatistics.jsp index 29a6910..0d5a9ee 100644 --- a/src/main/webapp/WEB-INF/views/workHome/callBackStatistics.jsp +++ b/src/main/webapp/WEB-INF/views/workHome/callBackStatistics.jsp @@ -40,7 +40,7 @@ "count":3 }, ]*/ - //出院列表 + //HIS退回病历统计 function initTable() { if (tipLoad == 1) { $("#table").bootstrapTable({ // 对应table标签的id @@ -101,7 +101,7 @@ valign: 'middle' }, { - title: '日期', + title: '审批日期', field: 'time', align: 'left', valign: 'middle' diff --git a/src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp b/src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp index 1d84849..ca86d5d 100644 --- a/src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp +++ b/src/main/webapp/WEB-INF/views/workHome/workHomeList.jsp @@ -57,8 +57,8 @@ $(function(){ loadTimeInterval(); initDateInput('startDateTo','endDateTo'); - $("#startDateTo").val(getHisDay(15)); - $("#endDateTo").val(getHisDay(8)); + //设置默认起止日期 + setDate('startDateTo','endDateTo'); }) //出院时段触发查询 function loadTableByTime(value,startDateId,endDateId,tableId){ diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index 40faf91..4b5992a 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -414,6 +414,12 @@ function initTable4(data) { align: 'left', valign: 'middle' }, + { + title: '出院日期', + field: 'dischargeDateTime', + align: 'left', + valign: 'middle' + }, { title: '出院日期', field: 'dischargeDateTime', @@ -498,6 +504,8 @@ $("#verifyBtn").on('click', function () { //归档状态改为初审还是有就是初审内容保存 //判断完整性 var result = checkSuccessMethod(id); + //记录单条完整性 + $("#result").val(result); if(result != '完整'){ result = "完整性未通过:"+result+";"; } @@ -628,7 +636,7 @@ function save(successCount,failSelects){ $.ajax({ url: path+"/beHosp/updateStateByArchivId", type: "POST", - data: {id: id, remark: firstTrial,archivestate:archivestate, isSuccess:isSuccess,status: roleCode,roles:role,formToken:$("#formToken").val()}, + data: {id: id, remark: firstTrial,archivestate:archivestate, isSuccess:isSuccess,status: roleCode,roles:role,formToken:$("#formToken").val(),lockInfo:$("#result").val()}, dataType:'json', success: function (data) { if(data.code == 100){ @@ -823,8 +831,8 @@ $(function () { } else { $('#deptDiv').hide(); } - $("#startDateTo").val(getHisDay(15)); - $("#endDateTo").val(getHisDay(8)); + //设置默认起止日期 + setDate('startDateTo','endDateTo'); }); //导出excel功能 diff --git a/src/main/webapp/static/js/comm.js b/src/main/webapp/static/js/comm.js index 9e1f1ee..f88b32a 100644 --- a/src/main/webapp/static/js/comm.js +++ b/src/main/webapp/static/js/comm.js @@ -401,3 +401,8 @@ function setSearchWhere(startDateId,endDateId){ } } } + +function setDate(startInputId,endInputId) { + $("#" + startInputId).val(getHisDay(14)); + $("#" + endInputId).val(getNowDay()); +} diff --git a/src/main/webapp/static/js/faultList/faultList.js b/src/main/webapp/static/js/faultList/faultList.js index c039858..c88d3ea 100644 --- a/src/main/webapp/static/js/faultList/faultList.js +++ b/src/main/webapp/static/js/faultList/faultList.js @@ -233,6 +233,8 @@ function initTable() { } $(function () { + //设置默认起止日期 + setDate('startDateTo','endDateTo'); //加载权限科室 getPowerDept(); var url = window.location.href; diff --git a/src/main/webapp/static/js/flowInfo/flowInfoList.js b/src/main/webapp/static/js/flowInfo/flowInfoList.js index 4337cdc..c1557e7 100644 --- a/src/main/webapp/static/js/flowInfo/flowInfoList.js +++ b/src/main/webapp/static/js/flowInfo/flowInfoList.js @@ -3,6 +3,8 @@ var tipLoad = 1; var maxHeight = 0; $(function(){ getDept(); + //设置默认起止日期 + setDate('startTime2','endTime2'); }) function initTable() { if(tipLoad == 1){ diff --git a/src/main/webapp/static/js/inHospList/inHospList.js b/src/main/webapp/static/js/inHospList/inHospList.js index 22e9204..5b32ef3 100644 --- a/src/main/webapp/static/js/inHospList/inHospList.js +++ b/src/main/webapp/static/js/inHospList/inHospList.js @@ -3,6 +3,8 @@ var tipLoad = 1; //定义表格内容最大高度 var maxHeight = 0; $(function () { + //设置默认起止日期 + setDate('startDateTo','endDateTo'); //加载主管医生列表 loadDoctorInCharge(); //加载权限科室 diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index 7018dc0..b31ab17 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -650,8 +650,8 @@ $("#getRecallBtn").on('click', function () { }); $(function () { - $("#startDateTo").val(getHisDay(15)); - $("#endDateTo").val(getHisDay(8)); + //设置默认起止日期 + setDate('startDateTo','endDateTo'); //加载科室 getDept(); $(".modal-dialog").draggable();//为模态对话框添加拖拽 diff --git a/src/main/webapp/static/js/record/deptOverTimeInfo.js b/src/main/webapp/static/js/record/deptOverTimeInfo.js index e5e5f0f..1d53b8f 100644 --- a/src/main/webapp/static/js/record/deptOverTimeInfo.js +++ b/src/main/webapp/static/js/record/deptOverTimeInfo.js @@ -11,6 +11,8 @@ $(function(){ getChecker(); //加载病案统计 selectOvertimeCount(); + //设置默认起止日期 + setDate('startTime1','endTime1'); }) //加载科室内主管医生列表 diff --git a/src/main/webapp/static/js/record/signedRecord.js b/src/main/webapp/static/js/record/signedRecord.js index f3c1ae0..11436b9 100644 --- a/src/main/webapp/static/js/record/signedRecord.js +++ b/src/main/webapp/static/js/record/signedRecord.js @@ -6,6 +6,8 @@ $(function(){ //加载科室 getDeptStatistics(); initTable(); + //设置默认起止日期 + setDate('startTime1','endTime1'); }) //出院时段触发查询 diff --git a/src/main/webapp/static/js/record/submitRecord.js b/src/main/webapp/static/js/record/submitRecord.js index bce4055..61b531c 100644 --- a/src/main/webapp/static/js/record/submitRecord.js +++ b/src/main/webapp/static/js/record/submitRecord.js @@ -10,6 +10,8 @@ $(function(){ selectCount(); //赋值审核角色 getChecker(); + //设置默认起止日期 + setDate('startTime1','endTime1'); }) //加载病案统计 function selectCount(){ diff --git a/src/main/webapp/static/js/statistics/finalStatisticsDetail.js b/src/main/webapp/static/js/statistics/finalStatisticsDetail.js index a9da580..f65ecb3 100644 --- a/src/main/webapp/static/js/statistics/finalStatisticsDetail.js +++ b/src/main/webapp/static/js/statistics/finalStatisticsDetail.js @@ -3,6 +3,8 @@ var tipLoad = 1; var maxHeight = 0; $(function(){ getDept(); + //设置默认起止日期 + setDate('startTime2','endTime2'); }) function initTable() { if(tipLoad == 1){ diff --git a/src/main/webapp/static/js/statistics/recordStatistics.js b/src/main/webapp/static/js/statistics/recordStatistics.js index ce954f9..37bb92c 100644 --- a/src/main/webapp/static/js/statistics/recordStatistics.js +++ b/src/main/webapp/static/js/statistics/recordStatistics.js @@ -18,6 +18,8 @@ $(function(){ initTable2(getDeptName(),'table2'); break; } + //设置默认起止日期 + setDate('startTime1','endTime1'); }) //加载科室 function getDeptStatistics() { diff --git a/src/main/webapp/static/js/statistics/scanCount.js b/src/main/webapp/static/js/statistics/scanCount.js index 58e6432..3bfc46c 100644 --- a/src/main/webapp/static/js/statistics/scanCount.js +++ b/src/main/webapp/static/js/statistics/scanCount.js @@ -1,6 +1,10 @@ var tipLoad = 1; //定义表格内容最大高度 var maxHeight = 0; +$(function () { + //设置默认起止日期 + setDate('startTime1','endTime1'); +}) //按日期查询变更事件 $("#dateFlag").change(function(){ var value = $(this).val(); diff --git a/src/main/webapp/static/js/statistics/statisticsDetail.js b/src/main/webapp/static/js/statistics/statisticsDetail.js index 773c7fc..d5e26cd 100644 --- a/src/main/webapp/static/js/statistics/statisticsDetail.js +++ b/src/main/webapp/static/js/statistics/statisticsDetail.js @@ -3,6 +3,8 @@ var tipLoad = 1; var maxHeight = 0; $(function(){ getDept(); + //设置默认起止日期 + setDate('startTime2','endTime2'); }) function initTable() { if(tipLoad == 1){ diff --git a/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js b/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js index f4da043..c16a26d 100644 --- a/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js +++ b/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js @@ -39,6 +39,8 @@ $(function () { } else { $("#updateStateBtn2").hide(); } + //设置默认起止日期 + setDate('startDateTo','endDateTo'); }); function initTable() { diff --git a/src/main/webapp/static/js/vCount/doctorFileList.js b/src/main/webapp/static/js/vCount/doctorFileList.js index 9cd522a..8cba404 100644 --- a/src/main/webapp/static/js/vCount/doctorFileList.js +++ b/src/main/webapp/static/js/vCount/doctorFileList.js @@ -2,22 +2,8 @@ $(function () { getDept(); //日期控件 initDateInput('startDate','endDate'); - var nowdays = new Date(); - var year = nowdays.getFullYear(); - var month = nowdays.getMonth(); - if(month==0) - { - month=12; - year=year-1; - } - if (month < 10) { - month = "0" + month; - } - var firstDay = year + "-" + month + "-" + "01";//上个月的第一天 - var myDate = new Date(year, month, 0); - var lastDay = year + "-" + month + "-" + myDate.getDate();//上个月的最后一天 - $("#startDate").val(firstDay); - $("#endDate").val(lastDay); + //设置默认起止日期 + setDate('startDate','endDate'); }) //查询 function searchBtn(){ diff --git a/src/main/webapp/static/js/vCount/forceSumbitList.js b/src/main/webapp/static/js/vCount/forceSumbitList.js new file mode 100644 index 0000000..dfe53f9 --- /dev/null +++ b/src/main/webapp/static/js/vCount/forceSumbitList.js @@ -0,0 +1,234 @@ +var tipLoad = 1; +//定义表格内容最大高度 +var maxHeight = 0; +$(function () { + getDept(); + initDateInput('startDate', 'endDate'); + initDateInput('startDate1', 'endDate1'); + //设置默认起止日期 + setDate('startDate1','endDate1'); + //日期控件 + var url = window.location.href; + var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); + if (index != null && index != "" && index.indexOf("export") != -1) { + $("#excelBtn").show(); + $("#toolbar").show(); + } else { + $("#excelBtn").hide(); + $(".columns-right").hide(); + } +}); + +function initTable() { + if (tipLoad == 1) { + $("#table").bootstrapTable({ // 对应table标签的id + //method: 'POST', + url: path+"/forceSumbit/getForceSumbitList", // 获取表格数据的url + contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 + cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true + striped: true, //表格显示条纹，默认为false + pagination: true, // 在表格底部显示分页组件，默认false + pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 + sidePagination: 'server', // 设置为服务器端分页 客户端：client + search: false, + showColumns: true, + paginationShowPageGo: true, + // sortable: true, + // sortOrder: "asc", + toolbar: '#toolbar',//指定工具栏 + searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法 + undefinedText: '---', //当数据为 undefined 时显示的字符 + singleSelect: false,//设置True 将禁止多选 + clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox + //height: getHeight(220), //定义表格的高度。 + searchTimeOut: 500,// 默认500 设置搜索超时时间。 + toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' + paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 + showHeader: true,//是否显示列头。 + trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。 + //是否显示导出按钮 + showExport: true, + //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据） + exportDataType: "basic", + //导出文件类型 + exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'], + exportOptions: { + fileName: document.title + }, + queryParams: function (params) { + var currPageSize = this.pageSize; + if (currPageSize == 2) { + currPageSize = 10; + } + var limit = null; + var offset = params.offset; + //判断是否导出全部all + if ($("#sel_exportoption").val() == "all") { + offset = 0; + limit = this.totalRows; + this.pageSize = limit; + } else { + limit = currPageSize; + this.pageSize = currPageSize; + } + var temp = { + limit: limit, //页面大小 + offset: offset, //页码 + order: params.order, //排位命令（desc，asc） + inpNo: $("#inpNo").val(), + visitId: $("#visitId").val(), + name: $("#name").val(), + startDate: $("#startDate").val(), + endDate: $("#endDate").val(), + startDate1: $("#startDate1").val(), + endDate1: $("#endDate1").val(), + deptName: $("#deptName").val().toString(), + operNodeCode: $("#operNodeCode").val(), + creater: $("#creater").val(), + createrName: $("#createrName").val() + }; + return temp; + }, + sortName: 'id', // 要排序的字段 + sortOrder: 'desc', // 排序规则 + columns: [{ + title: '全选', + field: 'select', //复选框 + checkbox: true, + width: 25, + align: 'center', + valign: 'middle', + }, + { + title: '序号', + field: 'id', + align: 'center', + valign: 'middle', + formatter: function (value, row, index) { + return index + 1; + } + }, + { + title: '住院号', + field: 'inpNo', + align: 'center', + valign: 'middle', + }, + { + title: '住院次数', + field: 'visitId', + align: 'center', + valign: 'middle' + }, + { + title: '姓名', + field: 'name', + align: 'center', + valign: 'middle' + }, + { + title: '出院科室', + field: 'deptName', + align: 'center', + valign: 'middle' + }, + { + title: '出院日期', + field: 'dischargeDateTime', + align: 'center', + valign: 'middle' + }, + { + title: '操作节点', + field: 'operNodeCode', + align: 'center', + valign: 'middle' + }, + { + title: '操作人工号', + field: 'creater', + align: 'center', + valign: 'middle' + }, + { + title: '操作人姓名', + field: 'createrName', + align: 'center', + valign: 'middle' + }, + { + title: '操作时间', + field: 'createTimeStr', + align: 'center', + valign: 'middle' + }, + { + title: '缺失信息', + field: 'lockInfo', + align: 'center', + valign: 'middle', + formatter: function (value) { + return ''; + } + }, + { + title: '状态', + field: 'stateCode', + align: 'center', + valign: 'middle' + } + ], + onLoadSuccess: function (result) { //加载成功时执行 + //console.info("加载成功"); + $(".page-list").show(); + tipLoad = 0; + reloadTableHeight("table"); + }, + onLoadError: function () { //加载失败时执行 + //console.info("加载数据失败"); + tipLoad = 0; + } + }); + } +} + +//查询 +$('#searchBtn').click(function () { + //查询之后重新从第一页算起 + if (tipLoad == 0) { + $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); + } else { + toastr.warning("正在查询，请稍等..."); + } +}); + +initTable(); + +//2.初始化select的change事件 +$("#sel_exportoption").change(function () { + $('#table').bootstrapTable('refreshOptions', { + exportDataType: $(this).val() + }); +}); +$("#refreshBtn").click(function () { + //刷新 + $('#table').bootstrapTable('refresh'); +}); + +//导出excel功能 +$("#excelBtn").click(function () { + var url = path+"/forceSumbit/exportExcel"; + post(url, { + "inpNo": $("#inpNo").val(), + "visitId": $("#visitId").val(), + "name": $("#name").val(), + "startDate": $("#startDate").val(), + "endDate": $("#endDate").val(), + "startDate1": $("#startDate1").val(), + "endDate1": $("#endDate1").val(), + "deptName": $("#deptName").val().toString(), + "operNodeCode": $("#operNodeCode").val(), + "creater": $("#creater").val(), + "createrName": $("#createrName").val() + }); +}); \ No newline at end of file diff --git a/src/main/webapp/static/js/vCount/hisCallBackList.js b/src/main/webapp/static/js/vCount/hisCallBackList.js new file mode 100644 index 0000000..c70720b --- /dev/null +++ b/src/main/webapp/static/js/vCount/hisCallBackList.js @@ -0,0 +1,230 @@ +var tipLoad = 1; +//定义表格内容最大高度 +var maxHeight = 0; +$(function () { + getDept(); + initDateInput('startDateTo', 'endDateTo'); + initDateInput('startDateTo1', 'endDateTo1'); + initDateInput('startDateTo2', 'endDateTo2'); + //设置默认起止日期 + setDate('startDateTo','endDateTo'); + //日期控件 + var url = window.location.href; + var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); + if (index != null && index != "" && index.indexOf("export") != -1) { + $("#excelBtn").show(); + $("#toolbar").show(); + } else { + $("#excelBtn").hide(); + $(".columns-right").hide(); + } +}); + +function initTable() { + if (tipLoad == 1) { + $("#table").bootstrapTable({ // 对应table标签的id + //method: 'POST', + url: path+"/archiveExt/getHisCallBackList", // 获取表格数据的url + contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 + cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true + striped: true, //表格显示条纹，默认为false + pagination: true, // 在表格底部显示分页组件，默认false + pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 + sidePagination: 'server', // 设置为服务器端分页 客户端：client + search: false, + showColumns: true, + paginationShowPageGo: true, + // sortable: true, + // sortOrder: "asc", + toolbar: '#toolbar',//指定工具栏 + searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法 + undefinedText: '---', //当数据为 undefined 时显示的字符 + singleSelect: false,//设置True 将禁止多选 + clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox + //height: getHeight(220), //定义表格的高度。 + searchTimeOut: 500,// 默认500 设置搜索超时时间。 + toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' + paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 + showHeader: true,//是否显示列头。 + trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。 + //是否显示导出按钮 + showExport: true, + //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据） + exportDataType: "basic", + //导出文件类型 + exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'], + exportOptions: { + fileName: document.title + }, + queryParams: function (params) { + var currPageSize = this.pageSize; + if (currPageSize == 2) { + currPageSize = 10; + } + var limit = null; + var offset = params.offset; + //判断是否导出全部all + if ($("#sel_exportoption").val() == "all") { + offset = 0; + limit = this.totalRows; + this.pageSize = limit; + } else { + limit = currPageSize; + this.pageSize = currPageSize; + } + var temp = { + limit: limit, //页面大小 + offset: offset, //页码 + order: params.order, //排位命令（desc，asc） + zyh: $("#zyh").val(), + c1: $("#c1").val(), + visitId: $("#visitId").val(), + startDateTo: $("#startDateTo").val(), + endDateTo: $("#endDateTo").val(), + startDateTo1: $("#startDateTo1").val(), + endDateTo1: $("#endDateTo1").val(), + startDateTo2: $("#startDateTo2").val(), + endDateTo2: $("#endDateTo2").val(), + deptName: $("#deptName").val().toString(), + statusflag: $("#statusflag").val(), + n2: $("#n2").val() + }; + return temp; + }, + sortName: 'id', // 要排序的字段 + sortOrder: 'desc', // 排序规则 + columns: [{ + title: '全选', + field: 'select', //复选框 + checkbox: true, + width: 25, + align: 'center', + valign: 'middle', + }, + { + title: '序号', + field: 'id', + align: 'center', + valign: 'middle', + formatter: function (value, row, index) { + return index + 1; + } + }, + { + title: '申请时间', + field: 'sysupdatetimeStr', + align: 'center' + }, + { + title: '审批时间', + field: 't2Str', + align: 'center' + }, + { + title: '住院号', + field: 'zyh', + align: 'center' + }, + { + title: '患者姓名', + field: 'c1', + align: 'center' + }, + { + title: '住院次数', + field: 'visitId', + align: 'center' + }, + { + title: '出院日期', + field: 't1Str', + align: 'center' + }, + { + title: '出院科室', + field: 'deptName', + align: 'center' + }, + { + title: '处理状态', + field: 'statusFlagStr', + align: 'center' + }, + { + title: '开始时间', + field: 'stimeStr', + align: 'center' + }, + { + title: '结束时间', + field: 'etimeStr', + align: 'center' + }, + { + title: '归档状态', + field: 'n2Str', + align: 'center', + formatter: function (value, row, index) { + var color = 'red'; + if (value == '已归档') { + color = 'green'; + } + return "" + value + ""; + } + } + ], + onLoadSuccess: function (result) { //加载成功时执行 + //console.info("加载成功"); + $(".page-list").show(); + tipLoad = 0; + reloadTableHeight("table"); + }, + onLoadError: function () { //加载失败时执行 + //console.info("加载数据失败"); + tipLoad = 0; + } + }); + } +} + +//查询 +$('#searchBtn').click(function () { + //查询之后重新从第一页算起 + if (tipLoad == 0) { + $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); + } else { + toastr.warning("正在查询，请稍等..."); + } +}); + +initTable(); + +//2.初始化select的change事件 +$("#sel_exportoption").change(function () { + $('#table').bootstrapTable('refreshOptions', { + exportDataType: $(this).val() + }); +}); +$("#refreshBtn").click(function () { + //刷新 + $('#table').bootstrapTable('refresh'); +}); + +//导出excel功能 +$("#excelBtn").click(function () { + var url = path+"/archiveExt/exportExcel"; + post(url, { + "zyh": $("#zyh").val(), + "c1": $("#c1").val(), + "visitId": $("#visitId").val(), + "startDateTo": $("#startDateTo").val(), + "endDateTo": $("#endDateTo").val(), + "startDateTo1": $("#startDateTo1").val(), + "endDateTo1": $("#endDateTo1").val(), + "startDateTo2": $("#startDateTo2").val(), + "endDateTo2": $("#endDateTo2").val(), + "deptName": $("#deptName").val().toString(), + "statusflag": $("#statusflag").val(), + "n2": $("#n2").val() + }); +}); \ No newline at end of file diff --git a/src/main/webapp/static/js/vCount/vCountList.js b/src/main/webapp/static/js/vCount/vCountList.js index 98da5e4..2802ede 100644 --- a/src/main/webapp/static/js/vCount/vCountList.js +++ b/src/main/webapp/static/js/vCount/vCountList.js @@ -6,6 +6,8 @@ $(function () { getDept(); //日期控件 initDateInput('startDate', 'endDate'); + //设置默认起止日期 + setDate('startDate','endDate'); var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); /* if (index != null && index != "" && index.indexOf("excel") != -1) {