无纸化归档功能修改

master
xuhaoxiang 4 years ago
parent b9caa48356
commit cfae039cad

@ -350,7 +350,7 @@ public class beHospitaledController {
archive_master_following.setHandleId(username);
archive_master_following.setHandleName(handleName);
bol = archive_master_followingService.insertSelective(archive_master_following);
addArchiveOther(archiveMasterVo);
//addArchiveOther(archiveMasterVo);
}else{
result = "医生提交失败,存在缺陷未处理!";
}

@ -9,6 +9,7 @@ package com.emr.controller;
import com.emr.entity.Emr_Fault_Type;
import com.emr.entity.Emr_Fault_Vo;
import com.emr.service.Emr_Fault_TypeService;
import com.emr.util.IDHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@ -39,7 +40,7 @@ public class faultTypeController {
@ResponseBody
@RequestMapping(value = "/updateByClo")
public int updateByClo(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Type emrFaultType) {
public int updateByClo(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Type emrFaultType) throws Exception{
int bol=0;
//判断id是否存在
if(emrFaultType.getId()!=null){
@ -49,6 +50,9 @@ public class faultTypeController {
}
}else{
//不存在则添加缺陷类别记录
//查询id最大的数据取id+1作为新id的值
Emr_Fault_Type emrFaultTypeNew=emrFaultTypeService.selectByColDesc();
emrFaultType.setId(emrFaultTypeNew.getId()+1);
bol= emrFaultTypeService.insertClo(emrFaultType);
}
return bol;

@ -275,9 +275,14 @@ public class inHospitalController {
Archive_Detail archiveDetail = new Archive_Detail();
archiveDetail.setFlag(flag);
archiveDetail.setMasterid(masterId.trim());
archiveDetail.setTitle(assortID);
List<Archive_Detail> arList = archiveDetailService.selectByCol(archiveDetail);
List<Archive_Detail> arList =new ArrayList<>();
//如果是新生儿则不加分段id的筛选条件,
if("1000".equals(assortID)){
arList =archiveDetailService.selectChildList(archiveDetail);
}else{
archiveDetail.setTitle(assortID);
arList = archiveDetailService.selectByCol(archiveDetail);
}
List<Archive_Detail> errorPdfList = new ArrayList<>();
int size = 0;
@ -1282,6 +1287,12 @@ public class inHospitalController {
@RequestMapping(value = "/pdfStreamHandeler")
public void pdfStreamHandeler(HttpServletRequest request, HttpServletResponse response) {
String filePath = request.getParameter("url");
//titleName为前端页面title显示的患者姓名这里要去掉
String[] list=filePath.split("titleName=");
if(list.length>1){
String path=list[0].substring(0,list[0].length()-1);
filePath=list[0].substring(0,list[0].length()-1);
}
File file = new File(filePath);
byte[] data = null;
try {

@ -104,44 +104,86 @@ public class signListController {
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Archive_Master> master=archiveMasterService.selectByCol(archiveMasterVo);
Sign_List signList=new Sign_List();
if(master!=null&&master.size()>0&&"1".equals(master.get(0).getIsscaned())){
//判断master表里纸质病历已经提交且有医生提交记录则取医生数据作为提交人否则护士为提交人
signList.setC2("".equals(master.get(0).getDoctorName())&&master.get(0).getDoctorName()!=null?master.get(0).getDoctorName():master.get(0).getNurseName());
//送纸质病历者所在科室
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList= JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
ln:for (JSONObject jsonObjectNew : powerUserList) {
if(jsonObjectNew.getString("userName").equals(signList.getC2())){
signList.setC3(jsonObjectNew.getString("deptId"));
break ln;
if(master!=null&&master.size()>0){
if(!"0".equals(master.get(0).getIsscaned())){
//判断master表里纸质病历已经提交且有医生提交记录则取医生数据作为提交人否则护士为提交人
signList.setC2("".equals(master.get(0).getDoctorName())&&master.get(0).getDoctorName()!=null?master.get(0).getDoctorName():master.get(0).getNurseName());
//送纸质病历者所在科室
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList= JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
ln:for (JSONObject jsonObjectNew : powerUserList) {
if(jsonObjectNew.getString("userName").equals(signList.getC2())){
signList.setC3(jsonObjectNew.getString("deptId"));
break ln;
}
}
}
//signList.setC3()
signList.setSysFlag(1);
signList.setMasterID(master.get(0).getId());
signList.setPid(master.get(0).getPatientId());
//signList.setC3()
signList.setSysFlag(1);
signList.setMasterID(master.get(0).getId());
signList.setPid(master.get(0).getPatientId());
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
signList.setC1((String)session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList=signListService.selectSignListWith(signList);
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
signList.setC1((String)session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList=signListService.selectSignListWith(signList);
signList.setId(IDHelper.NewID());
signList.setId(IDHelper.NewID());
/*signList.setC2(master.get(0).getSigner());
signList.setC3(master.get(0).getDeptName());*/
signList.setCreatedtime(sdf.format(new Date()));
signList.setdTime(sdf.format(new Date()));
signList.setT1(sdf.format(new Date()));
int z=signListService.insertSignList(signList);
result="签收成功";
signList.setCreatedtime(sdf.format(new Date()));
signList.setdTime(sdf.format(new Date()));
signList.setT1(sdf.format(new Date()));
int z=signListService.insertSignList(signList);
result="签收成功";
}else{
result="该病历归档医生或护士尚未提交,是否强制签收?";
}
}else{
result="医生或护士未在系统操作提交纸质病历";
result="未查询到住院号为:"+archiveMasterVo.getInpNo()+"的患者住院病历信息";
}
//OffsetLimitPage result = archiveMasterService.selectByLast(archiveMasterVo);
return result;
}
@ResponseBody
@RequestMapping(value = "/addSignListForce")
public String addSignListForce(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo) throws Exception {
response.setCharacterEncoding("utf-8");
request.setCharacterEncoding("utf-8");
String result="";
SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Archive_Master> master=archiveMasterService.selectByCol(archiveMasterVo);
Sign_List signList=new Sign_List();
signList.setOtherInfo("强制签收");
//判断master表里纸质病历已经提交且有医生提交记录则取医生数据作为提交人否则护士为提交人
signList.setC2("".equals(master.get(0).getDoctorName())&&master.get(0).getDoctorName()!=null?master.get(0).getDoctorName():master.get(0).getNurseName());
//送纸质病历者所在科室
JSONArray powerUsers = powerUserService.getPowerUserList("1");
List<JSONObject> powerUserList= JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
ln:for (JSONObject jsonObjectNew : powerUserList) {
if(jsonObjectNew.getString("userName").equals(signList.getC2())){
signList.setC3(jsonObjectNew.getString("deptId"));
break ln;
}
}
signList.setSysFlag(1);
signList.setMasterID(master.get(0).getId());
signList.setPid(master.get(0).getPatientId());
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
signList.setC1((String)session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList=signListService.selectSignListWith(signList);
signList.setId(IDHelper.NewID());
signList.setCreatedtime(sdf.format(new Date()));
signList.setdTime(sdf.format(new Date()));
signList.setT1(sdf.format(new Date()));
signListService.insertSignList(signList);
result="签收成功";
return result;
}
/* @ResponseBody
@RequestMapping(value = "/signList")
public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) throws UnsupportedEncodingException {

@ -91,6 +91,13 @@ public interface Archive_DetailMapper {
*/
List<Archive_Detail_Vo> selectChild(Archive_Detail_Vo record);
/**
* ()
* @param record
* @return
*/
List<Archive_Detail> selectChildList(Archive_Detail record);
/**
*
* @param record

@ -32,7 +32,11 @@ public interface Emr_Fault_TypeMapper {
* @return
*/
List<Emr_Fault_Type> selectByCol(Emr_Fault_Type record);
/**
* id
* @return
*/
Emr_Fault_Type selectByColDesc();
/**
*
* @param record

@ -138,6 +138,17 @@ public class Archive_Master_Vo {
private String endSignDate;
//科主任是否审核标志
private String checkFlag;
public String getCheckFlag() {
return checkFlag;
}
public void setCheckFlag(String checkFlag) {
this.checkFlag = checkFlag;
}
public String getOverdueDays() {
return overdueDays;
}

@ -96,6 +96,15 @@ public class Sign_List_Vo {
*/
private String dischargeDateTime;
/**
*
*/
private String deptAdmissionTo;
/**
*
*/
private String admissionDateTime;
/**
*
*/
@ -115,6 +124,22 @@ public class Sign_List_Vo {
*/
private String endSignDate;
public String getDeptAdmissionTo() {
return deptAdmissionTo;
}
public void setDeptAdmissionTo(String deptAdmissionTo) {
this.deptAdmissionTo = deptAdmissionTo;
}
public String getAdmissionDateTime() {
return admissionDateTime;
}
public void setAdmissionDateTime(String admissionDateTime) {
this.admissionDateTime = admissionDateTime;
}
public String getNum() {
return num;
}

@ -40,6 +40,14 @@ public interface Archive_DetailService {
*/
OffsetLimitPage selectChild(Archive_Detail_Vo record, Integer offset, Integer limit);
/**
* ()
*
* @param record
* @return
*/
List<Archive_Detail> selectChildList(Archive_Detail record);
/**
*
*

@ -18,6 +18,12 @@ public interface Emr_Fault_TypeService {
*/
List<Emr_Fault_Type> selectByCol(Emr_Fault_Type record);
/**
* id
* @return
*/
Emr_Fault_Type selectByColDesc();
/**
*
*

@ -57,6 +57,12 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
return new OffsetLimitPage((Page) list);
}
@Override
public List<Archive_Detail> selectChildList(Archive_Detail record) {
List<Archive_Detail> list = archiveDetailMapper.selectChildList(record);
return list;
}
@Override
public OffsetLimitPage detailByClo(Archive_Detail_Vo record, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);

@ -35,6 +35,11 @@ public class Emr_Fault_TypeServiceImpl implements Emr_Fault_TypeService {
return emrFaultTypeMapper.insertClo(record);
}
@Override
public Emr_Fault_Type selectByColDesc() {
return emrFaultTypeMapper.selectByColDesc();
}
@Override
public int delById(Integer id) {
return emrFaultTypeMapper.delById(id);

@ -87,6 +87,24 @@
</if>
</select>
<select id="selectChildList" resultMap="BaseResultMap" parameterType="com.emr.entity.Archive_Detail">
select
<include refid="Base_Column_List"/>
from
archive_detail
where MasterID in (select id from archive_master where inp_no like '%'+(
select inp_no from archive_master where 1=1
<if test="masterid != null and masterid != ''">
and id=#{masterid,jdbcType=VARCHAR}
</if>)+'%'
and patindex('%B%',inp_no) != 0
and id!=#{masterid,jdbcType=VARCHAR}
)
<if test="flag != null">
and flag = #{flag,jdbcType=NVARCHAR}
</if>
</select>
<select id="selectByClo" resultMap="BaseResultMap2" parameterType="com.emr.entity.Archive_Detail_Vo">
SELECT z.assort_id,z.assort_name,z.assort_sort,z.print_flag,s.pageNum
from(select AssortID,count(*) pageNum from
@ -200,6 +218,79 @@
</select>
<select id="sourceByClo" resultMap="BaseResultMap2" parameterType="com.emr.entity.Archive_Detail_Vo">
select DISTINCT d.Source
from zd_assort z left join(
select t.MasterID,t.AssortId,t.id,t.PDF_PATH,t.Source,CONVERT(varchar(100),t.UpLoadDateTime, 120) UpLoadDateTime,t.SubAssort,t.Title,t.flag,t.page_number from archive_detail t left join archive_master f on t.MasterID=f.id
where 1=1
<if test="patientId != null">
and f.id=#{patientId,jdbcType=VARCHAR}
</if>
and t.Source is not null) d
on z.assort_id=d.AssortId
where d.Source is not null
<if test="assortId != null and assortId != ''">
and d.AssortID=#{assortId,jdbcType=VARCHAR}
</if>
<if test="source != null and source != '' and source!='-1'">
and d.Source=#{source,jdbcType=VARCHAR}
</if>
<if test="source =='-1'">
and d.Source is null
</if>
<if test="flag != null and flag != ''">
and d.flag = #{flag,jdbcType=NVARCHAR}
</if>
<if test="title != null and title != ''">
and d.title like '%'+#{title,jdbcType=VARCHAR}+'%'
</if>
<!--select DISTINCT k.Source
from zd_assort zz
left join (
select
t.MasterID,t.id,t.PDF_PATH,t.Source,CONVERT(varchar(100),t.UpLoadDateTime, 120) UpLoadDateTime,t.SubAssort,t.Title,t.flag,t.page_number,
z.assort_id,z.assort_name,z.assort_sort,z.print_flag,s.create_time,s.cmt_doctor_date,s.cmt_nurse_date,s.ArchiveState
from zd_assort z
left join archive_detail t
on z.assort_id=t.AssortID
LEFT JOIN(
select top 1 f.id,m.create_time,f.cmt_doctor_date,f.cmt_nurse_date,f.ArchiveState from
emr_fault_detail m
left join archive_master f
on m.archive_detail_id=f.id
where 1=1 and m.back_flag= 3
<if test="patientId != null">
and f.id in=#{patientId,jdbcType=VARCHAR}
</if>
) s
on s.id=t.MasterID
where 1=1
<if test="patientId != null">
and t.MasterID in (select id from archive_master where inp_no like '%'+(
select inp_no from archive_master where 1=1
<if test="patientId != null and patientId != ''">
and id=#{patientId,jdbcType=VARCHAR}
</if>)+'%'
and patindex('%B%',inp_no) != 0
union
select id from archive_master where id=#{patientId,jdbcType=VARCHAR}
)
</if>
<if test="source != null and source != '' and source!='-1'">
and t.Source=#{source,jdbcType=VARCHAR}
</if>
<if test="source=='-1'">
and t.Source is null
</if>
<if test="flag != null and flag != ''">
and t.flag = #{flag,jdbcType=NVARCHAR}
</if>
<if test="title != null and title != ''">
and t.title like '%'+#{title,jdbcType=VARCHAR}+'%'
</if>
)k
on zz.assort_id=k.assort_id
select DISTINCT t.Source
from zd_assort z
left join archive_detail t
@ -233,7 +324,7 @@
</if>
<if test="title != null and title != ''">
and t.title like '%'+#{title,jdbcType=VARCHAR}+'%'
</if>
</if>-->
</select>
<select id="selectByid" parameterType="java.lang.String" resultMap="BaseResultMap">
select

@ -93,6 +93,7 @@
<result column="is_sign" jdbcType="INTEGER" property="isSign" />
<result column="signer" jdbcType="NVARCHAR" property="signer"/>
<result column="sign_time" jdbcType="NVARCHAR" property="signTime"/>
<result column="check_flag" jdbcType="NVARCHAR" property="checkFlag"/>
</resultMap>
<sql id="Base_Column_List">
id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,
@ -148,7 +149,7 @@
</if>
</select>
<select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
select distinct m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name
select distinct m.id,m.patient_id,m.inp_no,m.cmt_doctor,m.cmt_nurse,m.visit_id,m.name,m.sex,f.name
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.doctor_name,m.nurse_name,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,bed_number
from archive_master m
@ -370,7 +371,7 @@
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,
m.is_scanning,m.bed_number,amf.following_type,ISNULL(s.numb, 0) numb,m.is_sign,m.signer,m.sign_time
m.is_scanning,m.bed_number,amf.following_type,ISNULL(s.numb, 0) numb,ao.C5 is_sign,ao.C1 signer
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -382,6 +383,8 @@
on m.id=amf.master_id and amf.following_type=9
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag is not null GROUP BY archive_detail_id) s
on m.id=s.archive_detail_id
LEFT JOIN archive_other ao
on m.id=ao.masterID
where 1=1 and ArchiveState in('初审')
and patindex('%B%',m.inp_no) = 0
<if test="id != null and id != ''">
@ -625,8 +628,10 @@
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning,
m.bed_number,ISNULL(s.numb, 0) numb
m.bed_number,ISNULL(s.numb, 0) numb,ISNULL(amf.num, 0) checkFlag
from archive_master m
LEFT JOIN(select master_id,count(*) num from Archive_Master_Following where following_type=5 GROUP BY master_id ) amf
on m.id=amf.master_id
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
on m.dept_admission_to=d.code

@ -26,6 +26,14 @@
where id = #{id,jdbcType=INTEGER}
order by type_sort
</select>
<select id="selectByColDesc" resultMap="BaseResultMap">
select
top(1)
<include refid="Base_Column_List" />
from emr_fault_type
where 1=1
order by id desc
</select>
<select id="selectByCol" parameterType="com.emr.entity.Emr_Fault_Type" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
@ -80,9 +88,9 @@
<insert id="insertClo" parameterType="com.emr.entity.Emr_Fault_Type">
insert into emr_fault_type
<trim prefix="(" suffix=")" suffixOverrides=",">
<!--<if test="id != null">-->
<!--id,-->
<!--</if>-->
<if test="id != null">
id,
</if>
<if test="archiveDetailId != null">
archive_detail_id,
</if>

@ -52,6 +52,8 @@
<result column="name" property="name" />
<result column="dept_name" property="deptName" />
<result column="discharge_date_time" property="dischargeDateTime" />
<result column="dept_admission_to" property="deptAdmissionTo" />
<result column="admission_date_time" property="admissionDateTime" />
<result column="isscaned" jdbcType="NVARCHAR" property="isscaned" />
<result column="num" property="num" />
</resultMap>
@ -63,13 +65,16 @@
<select id="selectSignList" parameterType="Sign_List_Vo" resultMap="BaseResultMapNew">
select
DISTINCT m.id, s.pid,s.createdtime, s.otherInfo, s.masterID, s.detailID, s.dTime,s.sysFlag, s.C1, s.C2, s.C3, s.C4, s.C5, s.N1, s.N2, s.N3, s.T1,
s.T2,s.T3,s.IsFullText,m.inp_no,m.visit_id,m.name,d.name as deptName,m.discharge_date_time,m.isscaned,(select COUNT(*) from archive_other where archive_other.pid=s.pid)as num
DISTINCT m.id,f.name dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time, s.pid,s.createdtime, s.otherInfo, s.masterID, s.detailID, s.dTime,s.sysFlag, s.C1, s.C2, s.C3, s.C4, s.C5, s.N1, s.N2, s.N3, s.T1,
s.T2,s.T3,s.IsFullText,m.inp_no,m.visit_id,m.name,CONVERT(varchar(10),m.admission_date_time, 120) admissionDateTime,d.name as deptAdmissionTo,m.isscaned,(select COUNT(*) from archive_other where archive_other.pid=s.pid)as num
from archive_other s
left join archive_master m
on s.masterID=m.id
LEFT JOIN emr_dictionary d
on m.dept_admission_to=d.code
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) f
on m.dept_name=f.code
where s.id in(
(select top 1 id from archive_other a where a.pid=s.pid and a.masterID=s.masterID ORDER BY createdtime desc)
)

@ -666,6 +666,12 @@
退回管理:
<button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">退回查看</button>
</div>
<div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
出院科室:<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期:<label id="outDeptDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="timeLine">
跟踪管理:
<button type="button" class="btn btn-info btn-sm" id="getTimeline">跟踪查看</button>
@ -2168,6 +2174,7 @@
}
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfToPdf",
type: "POST",
@ -2176,7 +2183,7 @@
if (result != "") {
//绝对路径
var pdfPath = result;
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -2212,6 +2219,7 @@
//上传后预览pdf文件,根据id直接获取pdf并合成
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfById",
type: "POST",
@ -2221,7 +2229,7 @@
//绝对路径
var pdfPath = result;
//console.log(result);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -3980,6 +3988,8 @@
}
$("#chargeLab").html(row.doctorInCharge);
$("#deptToLab").html(row.deptAdmissionTo);
$("#outDeptToLab").html(row.deptName);
$("#outDeptDateLab").html(row.dischargeDateTime);
$("#outHospLab").html(row.dischargeDisposition);
$("#inLab").html(row.inpNo);
$("#inTimeLab").html(row.visitId);

@ -647,6 +647,10 @@
<div class="col-sm-4">
入院日期:<label id="inDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="firstDiv">
初审管理:
<button type="button" class="btn btn-danger btn-sm" id="getFirstBtn">初审查看</button>
</div>
<div class="col-sm-3" id="recallDiv">
退回管理:
<button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">退回查看</button>
@ -655,9 +659,11 @@
<%--退回管理:--%>
<%--<button type="button" class="btn btn-danger btn-sm" id="getRecallBtn2">退回查看</button>--%>
<%--</div>--%>
<div class="col-sm-3" id="firstDiv">
初审管理:
<button type="button" class="btn btn-danger btn-sm" id="getFirstBtn">初审查看</button>
<div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
出院科室:<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期:<label id="outDeptDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="timeLine">
跟踪管理:
@ -2005,6 +2011,7 @@
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfToPdf",
type: "POST",
@ -2014,11 +2021,11 @@
//location.href =
//var pdfPath = result;
if ($("#currState").val() == "归档中") {
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + result);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + result+"?titleName="+titleName);
} else {
var archiveDetailId = $("#idLab").html();
//var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;
newWindow.location.href = "${path}/pdfCtr/pdfDir?roleVal=" + encodeURI(1) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&pdfPath=" + encodeURI(result);
newWindow.location.href = "${path}/pdfCtr/pdfDir?roleVal=" + encodeURI(1) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&pdfPath=" + encodeURI(result)+"&titleName="+encodeURI(titleName);
}
//newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
@ -2057,6 +2064,7 @@
//上传后预览pdf文件,根据id直接获取pdf并合成
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfById",
type: "POST",
@ -2066,7 +2074,7 @@
//var pdfPath = result;
//newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
var archiveDetailId = $("#idLab").html();
newWindow.location.href = "${path}/pdfCtr/pdfDir?roleVal=" + encodeURI(1) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&pdfPath=" + encodeURI(result);
newWindow.location.href = "${path}/pdfCtr/pdfDir?roleVal=" + encodeURI(1) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&pdfPath=" + encodeURI(result) + "&titleName=" + encodeURI(titleName);
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -3687,6 +3695,8 @@
}
$("#chargeLab").html(row.doctorInCharge);
$("#deptToLab").html(row.deptAdmissionTo);
$("#outDeptToLab").html(row.deptName);
$("#outDeptDateLab").html(row.dischargeDateTime);
$("#outHospLab").html(row.dischargeDisposition);
$("#inLab").html(row.inpNo);
$("#inTimeLab").html(row.visitId);

@ -558,6 +558,12 @@
<div class="col-sm-4">
入院日期:<label id="inDateLab" class="labCss"></label>
</div>
<div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
出院科室:<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期:<label id="outDeptDateLab" class="labCss"></label>
</div>
<%--<div class="col-sm-3">--%>
<%--完整性审核:--%>
<%--</div>--%>
@ -1788,6 +1794,7 @@
}
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfToPdf",
type: "POST",
@ -1799,7 +1806,7 @@
//var pdfPath = "C:/Users/Administrator/Desktop/测试/123.pdf";
//encodeURIComponent()处理http请求进行转化
//pdfStreamHandeler 为 @RequestMapping(value = "/pdfStreamHandeler")方法名
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
//var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;
// $('#pdfModal').modal({
@ -1849,6 +1856,7 @@
//上传后预览pdf文件,根据id直接获取pdf并合成
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfById",
type: "POST",
@ -1862,7 +1870,7 @@
//var pdfPath = "C:/Users/Administrator/Desktop/测试/123.pdf";
//encodeURIComponent()处理http请求进行转化
//pdfStreamHandeler 为 @RequestMapping(value = "/pdfStreamHandeler")方法名
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
//var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;
@ -2588,6 +2596,8 @@
}
$("#chargeLab").html(row.doctorInCharge);
$("#deptToLab").html(row.deptAdmissionTo);
$("#outDeptToLab").html(row.deptName);
$("#outDeptDateLab").html(row.dischargeDateTime);
$("#outHospLab").html(row.dischargeDisposition);
$("#inLab").html(row.inpNo);

@ -575,13 +575,19 @@
<div class="col-sm-4">
入院日期:<label id="inDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="firstDiv">
初审管理:
<button type="button" class="btn btn-danger btn-sm" id="getFirstBtn">初审查看</button>
</div>
<div class="col-sm-3" id="recallDiv">
缺陷管理:
<button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">缺陷查看</button>
</div>
<div class="col-sm-3" id="firstDiv">
初审管理:
<button type="button" class="btn btn-danger btn-sm" id="getFirstBtn">初审查看</button>
<div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
出院科室:<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期:<label id="outDeptDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="timeLine">
跟踪管理:
@ -1959,6 +1965,7 @@
}
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfToPdf",
type: "POST",
@ -1969,7 +1976,7 @@
//var pdfPath = result;
//newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
var archiveDetailId = $("#idLab").html();
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?archiveDetailId=" + encodeURI(archiveDetailId) + "&isscanedVal=" + encodeURI(isscanedVal)+ "&isSignVal=" + encodeURI(isSignVal)+ "&pdfPath=" + encodeURI(result);
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?archiveDetailId=" + encodeURI(archiveDetailId) + "&isscanedVal=" + encodeURI(isscanedVal)+ "&isSignVal=" + encodeURI(isSignVal)+ "&pdfPath=" + encodeURI(result)+"&titleName="+encodeURI(titleName);
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -2006,6 +2013,7 @@
//上传后预览pdf文件,根据id直接获取pdf并合成
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfById",
type: "POST",
@ -2017,7 +2025,7 @@
// var pdfPath = result;
//newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
var archiveDetailId = $("#idLab").html();
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?roleVal=" + encodeURI(2) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&isscanedVal=" + encodeURI(isscanedVal)+ "&isSignVal=" + encodeURI(isSignVal)+ "&pdfPath=" + encodeURI(result);
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?roleVal=" + encodeURI(2) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&isscanedVal=" + encodeURI(isscanedVal)+ "&isSignVal=" + encodeURI(isSignVal)+ "&pdfPath=" + encodeURI(result)+"&titleName="+encodeURI(titleName);
//相对路径
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;--%>
@ -3457,7 +3465,7 @@
if (value == "1") {
showVal="已签收";
colorVal="#030378;";
}else if (value == "0") {
}else if (value == "2") {
showVal="未签收";
colorVal="#c0c0c0;";
}else {
@ -3725,6 +3733,8 @@
}
$("#chargeLab").html(row.doctorInCharge);
$("#deptToLab").html(row.deptAdmissionTo);
$("#outDeptToLab").html(row.deptName);
$("#outDeptDateLab").html(row.dischargeDateTime);
$("#outHospLab").html(row.dischargeDisposition);
$("#inLab").html(row.inpNo);
$("#patientId").html(row.patientId);

@ -447,6 +447,10 @@
<div class="col-sm-4">
入院日期:<label id="inDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="firstDiv">
初审管理:
<button type="button" class="btn btn-danger btn-sm" id="getFirstBtn">初审查看</button>
</div>
<div class="col-sm-4" id="recallDiv">
退回管理:
<button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">退回查看</button>
@ -454,9 +458,11 @@
<%--<div class="col-sm-3">--%>
<%--完整性审核:--%>
<%--</div>--%>
<div class="col-sm-3" id="firstDiv">
初审管理:
<button type="button" class="btn btn-danger btn-sm" id="getFirstBtn">初审查看</button>
<div class="col-sm-3"><input type="text" id="outDeptLab" hidden/>
出院科室:<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期:<label id="outDeptDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="timeLine">
跟踪管理:
@ -1630,6 +1636,7 @@
}
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfToPdf",
type: "POST",
@ -1638,7 +1645,7 @@
if (result != "") {
//绝对路径
var archiveDetailId = $("#idLab").html();
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?archiveDetailId=" + encodeURI(archiveDetailId) + "&pdfPath=" + encodeURI(result)+"&type=1";
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?archiveDetailId=" + encodeURI(archiveDetailId) + "&pdfPath=" + encodeURI(result)+"&type=1"+"&titleName="+encodeURI(titleName);
//相对路径
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -1675,6 +1682,7 @@
//上传后预览pdf文件,根据id直接获取pdf并合成
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfById",
type: "POST",
@ -1683,7 +1691,7 @@
if (result != "") {
//绝对路径
var pdfPath = result;
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
//相对路径
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -2280,6 +2288,8 @@
$("#inDateLab").html(row.admissionDateTime.substring(0, 10));
$("#chargeLab").html(row.doctorInCharge);
$("#deptToLab").html(row.deptAdmissionTo);
$("#outDeptToLab").html(row.deptName);
$("#outDeptDateLab").html(row.admissionDateTime.substring(0, 10));
$("#outHospLab").html(row.dischargeDisposition);
$("#inLab").html(row.inpNo);
$("#inTimeLab").html(row.visitId);

@ -371,6 +371,12 @@
退回管理:
<button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">退回查看</button>
</div>
<div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
出院科室:<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期:<label id="outDeptDateLab" class="labCss"></label>
</div>
<%--<div class="col-sm-3">--%>
<%--完整性审核:--%>
<%--</div>--%>
@ -1507,6 +1513,7 @@
}
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfToPdf",
type: "POST",
@ -1515,7 +1522,7 @@
if (result != "") {
//绝对路径
var pdfPath = result;
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
//相对路径
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -1549,6 +1556,7 @@
//上传后预览pdf文件,根据id直接获取pdf并合成
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfById",
type: "POST",
@ -1557,7 +1565,7 @@
if (result != "") {
//绝对路径
var pdfPath = result;
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
//相对路径
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>

@ -452,6 +452,8 @@
//病案号
//var archiveDetailId="1333ad3c4d6448c89372835dbad3c364";
var archiveDetailId = GetQueryString("archiveDetailId");
//页面标题title
document.title = decodeURIComponent(GetQueryString("titleName")) ;
//1主任还是2病案室
var roleVal = 1;
//自动生成PDF的路径

@ -373,6 +373,7 @@
var pdfPath = GetQueryString("pdfPath");
var isSignVal = GetQueryString("isSignVal");
var isscanedVal = GetQueryString("isscanedVal");
document.title = decodeURIComponent(GetQueryString("titleName")) ;
//自定义id
var definedId;
//判断归档状态

@ -542,6 +542,12 @@
<div class="col-sm-4">
入院日期:<label id="inDateLab" class="labCss"></label>
</div>
<div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
出院科室:<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期:<label id="outDeptDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="recallDiv">
缺陷管理:
<button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">缺陷查看</button>
@ -1333,12 +1339,12 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title">是否强制提交</h4>
<h4 class="modal-title">是否强制签收</h4>
</div>
<div class="modal-body">
<form>
<div class="form-group ">
没签收是否强制提交
该病历归档医生或护士尚未提交,是否强制签收
</div>
</form>
</div>
@ -1925,6 +1931,7 @@
}
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfToPdf",
type: "POST",
@ -1935,7 +1942,7 @@
//var pdfPath = result;
//newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
var archiveDetailId = $("#idLab").html();
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?archiveDetailId=" + encodeURI(archiveDetailId) + "&isscanedVal=" + encodeURI(isscanedVal)+ "&isSignVal=" + encodeURI(isSignVal)+ "&pdfPath=" + encodeURI(result);
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?archiveDetailId=" + encodeURI(archiveDetailId) + "&isscanedVal=" + encodeURI(isscanedVal)+ "&isSignVal=" + encodeURI(isSignVal)+ "&pdfPath=" + encodeURI(result)+"&titleName="+encodeURI(titleName);
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -1972,6 +1979,7 @@
//上传后预览pdf文件,根据id直接获取pdf并合成
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfById",
type: "POST",
@ -1983,7 +1991,7 @@
// var pdfPath = result;
//newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
var archiveDetailId = $("#idLab").html();
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?roleVal=" + encodeURI(2) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&isscanedVal=" + encodeURI(isscanedVal)+ "&isSignVal=" + encodeURI(isSignVal)+ "&pdfPath=" + encodeURI(result);
newWindow.location.href = "${path}/pdfCtr/pdfLastDir?roleVal=" + encodeURI(2) + "&archiveDetailId=" + encodeURI(archiveDetailId) + "&isscanedVal=" + encodeURI(isscanedVal)+ "&isSignVal=" + encodeURI(isSignVal)+ "&pdfPath=" + encodeURI(result)+"&titleName="+encodeURI(titleName);
//相对路径
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;--%>
@ -2158,23 +2166,22 @@
});
function verinfyFun(){
//审核信息保存
var archiveDetailId = $("#archiveId").val();
var firstTrial = $("#verifyText").val();
if (firstTrial.length > 255) {
toastr.warning("内容长度不超过255!");
return;
}
var state = "已归档";
//强制签收
var signVal= $('#archiveIdSign').val();
signVal=signVal.trim();
var signArr=signVal.split("-");
var inpNo=signArr[0];
var visitId=signArr[1];
//归档状态改为初审还是有就是初审内容保存
$.ajax({
url: "${path}/lastVerify/updateStateByArchivId",
url: "${path}/signList/addSignListForce",
type: "POST",
data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, state: state},
data: {inpNo:inpNo, visitId: visitId},
success: function (result) {
$("#verifyModal").modal('hide');
$("#table").bootstrapTable("refresh");
toastr.success("终审操作成功!");
$('#table').bootstrapTable('refresh');
toastr.success(result);
}, error: function () {
toastr.error("操作失败!");
}
});
}
@ -2197,6 +2204,7 @@
$("#verinfyQZBtn").on('click', function () {
//有纸质且未签收,强制提交
verinfyFun();
$('#archiveIdSign').val('');
$("#verinfyQZModal").modal('hide');
});
@ -3413,6 +3421,8 @@
}
$("#chargeLab").html(row.doctorInCharge);
$("#deptToLab").html(row.deptAdmissionTo);
$("#outDeptToLab").html(row.deptName);
$("#outDeptDateLab").html(row.dischargeDateTime);
$("#outHospLab").html(row.dischargeDisposition);
$("#inLab").html(row.inpNo);
$("#inTimeLab").html(row.visitId);
@ -3461,7 +3471,8 @@
var isSign=0;
if(inpNo!=null && inpNo!="" && inpNo!=undefined && inpNo!="undefined"
&& visitId!=null && visitId!="" && inpNo!=undefined && visitId!="undefined"){
updateSignStateFun(inpNo,visitId,isSign);
//updateSignStateFun(inpNo,visitId,isSign);
}else{
toastr.warning("签收值格式应为:住院号-住院次数!");
}
@ -3962,6 +3973,13 @@
//刷新
$('#table').bootstrapTable('refresh');
toastr.success(result);
}else if(result.indexOf("该病历归档医生或护士尚未提交")!=-1){
//弹窗是否强制提交
$('#verinfyQZModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
} else {
toastr.warning(result);
}
@ -4015,7 +4033,7 @@
var inpNo=signArr[0];
var visitId=signArr[1];
var isSign=0;
updateSignStateFun(inpNo,visitId,isSign);
//updateSignStateFun(inpNo,visitId,isSign);
$('#archiveIdSign').val('');
}else{
toastr.warning("签收值格式应为:住院号-住院次数");

@ -675,6 +675,12 @@
初审管理:
<button type="button" class="btn btn-danger btn-sm" id="getFirstBtn">初审查看</button>
</div>
<div class="col-sm-3"><input type="text" id="outDeptLab" hidden/>
出院科室:<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期:<label id="outDeptDateLab" class="labCss"></label>
</div>
<div class="col-sm-3" id="timeLine">
跟踪管理:
<button type="button" class="btn btn-info btn-sm" id="getTimeline">跟踪查看</button>
@ -2001,6 +2007,7 @@
}
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfToPdf",
type: "POST",
@ -2009,7 +2016,7 @@
if (result != "") {
//绝对路径
var pdfPath = result;
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
//相对路径
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -2046,6 +2053,7 @@
//上传后预览pdf文件,根据id直接获取pdf并合成
//打开一个不被拦截的新窗口
var newWindow = window.open();
var titleName=document.getElementById("nameLab").innerText;
$.ajax({
url: "${path}/inHosp/getPdfById",
type: "POST",
@ -2054,7 +2062,7 @@
if (result != "") {
//绝对路径
var pdfPath = result;
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath);
newWindow.location.href = "${path}/static/pdfjs/web/viewer.html?file=" + encodeURIComponent("${path}/inHosp/pdfStreamHandeler?url=" + pdfPath+"?titleName="+titleName);
//相对路径
<%--var pdfUrl = "${path}/static/pdfjs/web/viewer.html?file=../../../static/img/pdfFiles/typesPdf/" + result;//+ result;--%>
<%--newWindow.location.href = pdfUrl;--%>
@ -3318,6 +3326,20 @@
return result;
}
},
{
title: '科主任是否审核',
field: 'checkFlag',
align: 'center',
formatter: function (value, row, index) {
var a = "";
if (value == 0) {
a = '<span style="color:orange;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已审核</span>';
} else {
a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未审核</span>';
}
return a;
}
},
{
title: '状态',
field: 'archivestate',
@ -3422,8 +3444,12 @@
if (row.admissionDateTime != null && row.admissionDateTime != '') {
$("#inDateLab").html(row.admissionDateTime.substring(0, 10));
}
if (row.dischargeDateTime != null && row.dischargeDateTime != '') {
$("#outDeptDateLab").html(row.dischargeDateTime.substring(0, 10));
}
$("#chargeLab").html(row.doctorInCharge);
$("#deptToLab").html(row.deptAdmissionTo);
$("#outDeptToLab").html(row.deptName);
$("#outHospLab").html(row.dischargeDisposition);
$("#inLab").html(row.inpNo);
$("#inTimeLab").html(row.visitId);

@ -22,7 +22,6 @@ http://sourceforge.net/adobe/cmap/wiki/License/
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="google" content="notranslate">
<title>PDF.js viewer</title>
<link rel="stylesheet" href="viewer.css"/>
@ -39,6 +38,18 @@ http://sourceforge.net/adobe/cmap/wiki/License/
<script src="debugger.js"></script>
<script type="text/javascript" language="javascript">
// 获取url参数名B
var name='titleName';
var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
var url = decodeURIComponent(window.location.href);
var index=url.split("?titleName=");
if(index[1]!=null&&index[1]!=undefined){
var TITLE =index[1];
}else{
var TITLE ="未知患者";
}
</script>
<script src="viewer.js"></script>
</head>
@ -413,7 +424,6 @@ http://sourceforge.net/adobe/cmap/wiki/License/
</div>
</div>
<script>
</script>
</body>
</html>

@ -5960,7 +5960,9 @@ var PDFViewerApplication = {
setTitleUsingUrl: function pdfViewSetTitleUsingUrl(url) {
this.url = url;
try {
this.setTitle(decodeURIComponent(getFileName(url)) || url);
var titleTmp = (TITLE == '' || TITLE == undefined) ?
(decodeURIComponent(pdfjsLib.getFilenameFromUrl(url)) || url) : TITLE;
this.setTitle(titleTmp);
} catch (e) {
// decodeURIComponent may throw URIError,
// fall back to using the unprocessed url in that case

Loading…
Cancel
Save