归档不现实签章内容

master
linjj 2 years ago
parent 066618de62
commit 1fa7480c33

@ -169,7 +169,9 @@ public class MedicalRecallController {
//留观号召回推送第三方
archiveMasterService.requestObservationRecord(inpatientNo,"RETURNED",emrFaultDetail.getRecallReason(),null);
}
result="召回成功!";
}
}else{

@ -126,24 +126,24 @@ public class inHospitalController {
@ResponseBody
@RequestMapping(value = "/getAssort")
public List<Archive_Detail_Vo> getAssort(HttpServletResponse response, Archive_Detail_Vo archiveDetailVo) throws Exception {
//查询是否签章
int caMasterIdNum = caSignatureMapper.getCaMasterId(archiveDetailVo.getPatientId(), 1);
//如果存在记录查询新的签章文件表
if (caMasterIdNum > 0) {
List<Archive_Detail_Vo> list = archiveDetailCaCopyMapper.selectByClo(archiveDetailVo);
//查询新生儿数据并存入list
Integer page = archiveDetailService.selectChildByClo(archiveDetailVo);
if (page != 0) {
Archive_Detail_Vo archiveDetailVoNew = new Archive_Detail_Vo();
archiveDetailVoNew.setAssortId("1000");
archiveDetailVoNew.setAssortName("新生儿病历");
archiveDetailVoNew.setPrintFlag("0");
archiveDetailVoNew.setPageNum(page);
archiveDetailVoNew.setAssortSort((short) 1000);
list.add(archiveDetailVoNew);
}
return list;
}
// //查询是否签章
// int caMasterIdNum = caSignatureMapper.getCaMasterId(archiveDetailVo.getPatientId(), 1);
// //如果存在记录查询新的签章文件表
// if (caMasterIdNum > 0) {
// List<Archive_Detail_Vo> list = archiveDetailCaCopyMapper.selectByClo(archiveDetailVo);
// //查询新生儿数据并存入list
// Integer page = archiveDetailService.selectChildByClo(archiveDetailVo);
// if (page != 0) {
// Archive_Detail_Vo archiveDetailVoNew = new Archive_Detail_Vo();
// archiveDetailVoNew.setAssortId("1000");
// archiveDetailVoNew.setAssortName("新生儿病历");
// archiveDetailVoNew.setPrintFlag("0");
// archiveDetailVoNew.setPageNum(page);
// archiveDetailVoNew.setAssortSort((short) 1000);
// list.add(archiveDetailVoNew);
// }
// return list;
// }
//分段列表
List<Archive_Detail_Vo> newList = archiveDetailService.selectByClo(archiveDetailVo);
//查询新生儿数据并存入list
@ -374,7 +374,7 @@ public class inHospitalController {
/**
* idPDFpdf
* idPDFpdf 2023-11-20
*
* @param response
* @param request
@ -386,21 +386,21 @@ public class inHospitalController {
@ResponseBody
@RequestMapping(value = "/getPdfToPdf")
public String getPdfToPdf(HttpServletResponse response, HttpServletRequest request, String imgStr, String masterId, String flag) throws Exception {
//查询是否签章
int caMasterIdNum = caSignatureMapper.getCaMasterId(masterId, 1);
//如果存在记录查询新的签章文件表
if (caMasterIdNum > 0) {
//组织分类id集合
if (StringUtils.isNotBlank(imgStr)) {
String[] assortIds = StringUtils.split(imgStr, ",");
List<String> srcFileList = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(assortIds, masterId, flag, null);
if (!CollectionUtils.isEmpty(srcFileList)) {
//设置进缓存
String key = SessionContant.setPdfUrl(masterId, imgStr, srcFileList, request);
return key;
}
}
}
// //查询是否签章
// int caMasterIdNum = caSignatureMapper.getCaMasterId(masterId, 1);
// //如果存在记录查询新的签章文件表
// if (caMasterIdNum > 0) {
// //组织分类id集合
// if (StringUtils.isNotBlank(imgStr)) {
// String[] assortIds = StringUtils.split(imgStr, ",");
// List<String> srcFileList = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(assortIds, masterId, flag, null);
// if (!CollectionUtils.isEmpty(srcFileList)) {
// //设置进缓存
// String key = SessionContant.setPdfUrl(masterId, imgStr, srcFileList, request);
// return key;
// }
// }
// }
//组织分类id集合
if (StringUtils.isNotBlank(imgStr)) {
String[] assortIds = StringUtils.split(imgStr, ",");
@ -537,7 +537,7 @@ public class inHospitalController {
}
/**
* idPDFpdf
* idPDFpdf 2023-11-20
*
* @param response
* @param request
@ -545,35 +545,56 @@ public class inHospitalController {
* @return
* @throws Exception
*/
@ResponseBody
@RequestMapping(value = "/getPdfById")
public String getPdfById(HttpServletResponse response, HttpServletRequest request, @Param("id") String idStr) throws Exception {
//组织分类id集合
if (StringUtils.isNotBlank(idStr)) {
if(StringUtils.isNotBlank(idStr)){
List<String> srcFileList = null;
List<String> list = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(null, null, null, idStr);
//如果存在记录查询新的签章文件表
if (list.size() > 0) {
if (!CollectionUtils.isEmpty(list)) {
//设置进缓存
String key = SessionContant.setPdfUrl(idStr, idStr, list, request);
return key;
}
} else {
try {
srcFileList = archiveDetailService.getPdfUrlByMasterOrId(null, null, null, idStr);
} catch (Exception e) {
e.printStackTrace();
}
if (!CollectionUtils.isEmpty(srcFileList)) {
//设置进缓存
String key = SessionContant.setPdfUrl(idStr, idStr, srcFileList, request);
return key;
}
try {
srcFileList = archiveDetailService.getPdfUrlByMasterOrId(null,null,null,idStr);
} catch (Exception e) {
e.printStackTrace();
}
if(!CollectionUtils.isEmpty(srcFileList)){
//设置进缓存
String key = SessionContant.setPdfUrl(idStr, idStr, srcFileList, request);
return key;
}
}
return null;
}
// @ResponseBody
// @RequestMapping(value = "/getPdfById")
// public String getPdfById(HttpServletResponse response, HttpServletRequest request, @Param("id") String idStr) throws Exception {
// //组织分类id集合
// if (StringUtils.isNotBlank(idStr)) {
// List<String> srcFileList = null;
// List<String> list = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(null, null, null, idStr);
// //如果存在记录查询新的签章文件表
// if (list.size() > 0) {
// if (!CollectionUtils.isEmpty(list)) {
// //设置进缓存
// String key = SessionContant.setPdfUrl(idStr, idStr, list, request);
// return key;
// }
// } else {
// try {
// srcFileList = archiveDetailService.getPdfUrlByMasterOrId(null, null, null, idStr);
// } catch (Exception e) {
// e.printStackTrace();
// }
// if (!CollectionUtils.isEmpty(srcFileList)) {
// //设置进缓存
// String key = SessionContant.setPdfUrl(idStr, idStr, srcFileList, request);
// return key;
// }
// }
// }
// return null;
// }
/*
public String getPdfById(HttpServletResponse response, HttpServletRequest request, @Param("id") String idStr) throws Exception {
request.setCharacterEncoding("utf-8");
@ -1400,51 +1421,86 @@ public class inHospitalController {
/**
* @Description: pdfStreamHandelerpdf
* @Description: pdfStreamHandelerpdf 2023-11-20
* @param: [request, response]
* @return: void
* @author
* @createTime 2023/6/21 15:46
*/
// @RequestMapping(value = "/pdfStreamHandeler")
// public void pdfStreamHandeler(HttpServletRequest request, HttpServletResponse response, String url) throws Exception {
// String filePath = request.getParameter("url");
// int caMasterIdNum = 0;
// int archiveDetailNum = 0;
// String[] list = filePath.split("titleName=");
// String key = list[0].substring(0, list[0].length() - 1);
// //titleName为前端页面title显示的患者姓名这里要去掉
// List<String> filePaths = SessionContant.getPdfUrl(key, request);
// if (CollectionUtils.isEmpty(filePaths) && StringUtils.isNotBlank(key)) {
// //终审页面没有缓存,key为Mid_文件id逗号隔开
// String[] keyArr = StringUtils.split(key, "_");
// String[] assortIds = StringUtils.split(keyArr[1], ",");
// String masterId = keyArr[0];
// //查询是否签章
// if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) {
// //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号
// archiveDetailNum = archiveDetailCaCopyMapper.getArchiveDetailNum(masterId);
// } else {
// caMasterIdNum = caSignatureMapper.getCaMasterId(masterId, 1);
// }
// //如果存在记录查询新的签章文件表
// if (caMasterIdNum > 0 || archiveDetailNum > 0) {
// if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) {
// //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号
// filePaths = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(null, null, "0", masterId);
// } else {
// //按文件分类id集合
// filePaths = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(assortIds, masterId, "0", null);
// }
// } else {
// if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) {
// //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号
// filePaths = archiveDetailService.getPdfUrlByMasterOrId(null, null, "0", masterId);
// } else {
// //按文件分类id集合
// filePaths = archiveDetailService.getPdfUrlByMasterOrId(assortIds, masterId, "0", null);
// }
// }
// }
// if (null != filePaths && !filePaths.isEmpty()) {
// try {
// //合成PDF
// Jpg2PdfUtil.mulFile2One(response, filePaths, null);
// //清除session里的filePaths值
// request.removeAttribute(key);
// } catch (Exception e) {
// ExceptionPrintUtil.printException(e);
// e.printStackTrace();
// }
// }
// }
@RequestMapping(value = "/pdfStreamHandeler")
public void pdfStreamHandeler(HttpServletRequest request, HttpServletResponse response, String url) throws Exception {
public void pdfStreamHandeler(HttpServletRequest request, HttpServletResponse response,String url)throws Exception {
String filePath = request.getParameter("url");
int caMasterIdNum = 0;
int archiveDetailNum = 0;
String[] list = filePath.split("titleName=");
String key = list[0].substring(0, list[0].length() - 1);
String[] list=filePath.split("titleName=");
String key =list[0].substring(0,list[0].length()-1);
//titleName为前端页面title显示的患者姓名这里要去掉
List<String> filePaths = SessionContant.getPdfUrl(key, request);
if (CollectionUtils.isEmpty(filePaths) && StringUtils.isNotBlank(key)) {
if(CollectionUtils.isEmpty(filePaths) && StringUtils.isNotBlank(key)){
//终审页面没有缓存,key为Mid_文件id逗号隔开
String[] keyArr = StringUtils.split(key, "_");
String[] assortIds = StringUtils.split(keyArr[1], ",");
String masterId = keyArr[0];
//查询是否签章
if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) {
if(masterId.substring(0,masterId.length()-1).equals(keyArr[1])){
//按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号
archiveDetailNum = archiveDetailCaCopyMapper.getArchiveDetailNum(masterId);
} else {
caMasterIdNum = caSignatureMapper.getCaMasterId(masterId, 1);
}
//如果存在记录查询新的签章文件表
if (caMasterIdNum > 0 || archiveDetailNum > 0) {
if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) {
//按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号
filePaths = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(null, null, "0", masterId);
} else {
//按文件分类id集合
filePaths = archiveDetailCaCopyServer.getPdfUrlByMasterOrId(assortIds, masterId, "0", null);
}
} else {
if (masterId.substring(0, masterId.length() - 1).equals(keyArr[1])) {
//按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号
filePaths = archiveDetailService.getPdfUrlByMasterOrId(null, null, "0", masterId);
} else {
//按文件分类id集合
filePaths = archiveDetailService.getPdfUrlByMasterOrId(assortIds, masterId, "0", null);
}
filePaths = archiveDetailService.getPdfUrlByMasterOrId(null,null,"0",masterId);
}else{
//按文件分类id集合
filePaths = archiveDetailService.getPdfUrlByMasterOrId(assortIds,masterId,"0",null);
}
}
if (null != filePaths && !filePaths.isEmpty()) {

@ -96,10 +96,10 @@ public class signListController {
@ResponseBody
@RequestMapping(value = "/signList")
public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, Sign_List_Vo signListVo, Integer offset, Integer limit) throws UnsupportedEncodingException {
public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, ArchiveFinalSignVo archiveFinalSignVo, Integer offset, Integer limit) throws UnsupportedEncodingException {
response.setCharacterEncoding("utf-8");
request.setCharacterEncoding("utf-8");
OffsetLimitPage result = signListService.selectSignList(signListVo, offset, limit);
OffsetLimitPage result = signListService.selectSignList(archiveFinalSignVo, offset, limit);
return result;
}
@ -169,18 +169,29 @@ public class signListController {
String username = user.getUserName();
signList.setC1(username);
signList.setC5("1");
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()));
Archive_Master archiveMaster = new Archive_Master();
archiveMaster.setIsSign(1);
archiveMaster.setId(master.get(0).getId());
int bol = archiveMasterService.updateByClo(archiveMaster);
int z = signListService.insertSignList(signList);
archiveMasterService.updateByClo(archiveMaster);
signListService.insertSignList(signList);
//增加最后签收记录
ArchiveFinalSignVo archiveFinalSignVo=new ArchiveFinalSignVo();
archiveFinalSignVo.setMasterId(master.get(0).getId());
archiveFinalSignVo.setInpNo(master.get(0).getInpNo());
archiveFinalSignVo.setVisitId(master.get(0).getVisitId());
archiveFinalSignVo.setName(master.get(0).getName());
archiveFinalSignVo.setDeptName(master.get(0).getDeptName());
archiveFinalSignVo.setDischargeDateTime(master.get(0).getDischargeDateTime());
archiveFinalSignVo.setSignStatic("1");
archiveFinalSignVo.setIsscaned("1");
archiveFinalSignVo.setOperateName(archiveMasterVo.getOperateName());
archiveFinalSignVo.setDTime(sdf.format(new Date()));
archiveFinalSignVo.setSignName(username);
signListService.addArchiveFinalSign(archiveFinalSignVo);
result = "签收成功";
} else {
result = "该病历归档医生或护士尚未提交,是否强制签收?";

@ -17,6 +17,9 @@ public interface ArchiveDetailCaCopyMapper {
int addArchiveDetailCaCopyMapper(@Param("list") List<Archive_DetailPdfPathDto> list);
int updateByMasterID(String masterID);
/**
*
* @param record

@ -0,0 +1,46 @@
package com.emr.dao;
import com.emr.entity.ArchiveFinalSignVo;
import org.apache.ibatis.annotations.Param;
import org.mybatis.spring.annotation.MapperScan;
import java.util.List;
/**
* @InterfaceName ArchiveFinalSignMapper
* @Author linjj
* @Date 2023/11/20 15:37
* @Version 1.0
*/
public interface ArchiveFinalSignMapper {
/**
* @description:
* @params: archiveFinalSignVo
* @return: int
* @author linjj
* @date: 2023/11/20 15:41
*/
int addFinalSign(ArchiveFinalSignVo archiveFinalSignVo);
/**
* @description:
* @params: masterId
* @return: int
* @author linjj
* @date: 2023/11/20 15:41
*/
int getIdNum(String masterId);
/**
* @description:
* @params: masterId
* @params: dTime
* @return: int
* @author linjj
* @date: 2023/11/20 15:44
*/
int updateDTimeBymasterId(@Param("masterId") String masterId,@Param("dTime") String dTime,@Param("operateName") String operateName);
List<ArchiveFinalSignVo> getArchiveFinalSignList(ArchiveFinalSignVo archiveFinalSignVo);
}

@ -0,0 +1,45 @@
package com.emr.entity;
import lombok.Data;
import java.util.Date;
/**
* @ClassName ArchiveFinalSignVo
* @Description
* @Author linjj
* @Date 2023/11/20 15:21
* @Version 1.0
*/
@Data
public class ArchiveFinalSignVo {
//masterId
private String masterId;
//住院号
private String inpNo;
//住院次数
private String visitId;
//患者姓名
private String name;
//出院科室
private String deptName;
//出院日期
private String dischargeDateTime;
//签收状态
private String signStatic;
//是否有纸质病历送到病案室
private String isscaned;
//最后签收时间
private String dTime;
//纸质病历送达人
private String operateName;
//签收人
private String signName;
//签收次数
private String num;
//开始时间
private String startSignDate;
//结束时间
private String endSignDate;
}

@ -22,7 +22,7 @@ public interface Sign_ListService {
* @param
* @return
*/
OffsetLimitPage selectSignList(Sign_List_Vo signListVo, Integer offset, Integer limit);
OffsetLimitPage selectSignList(ArchiveFinalSignVo archiveFinalSignVo, Integer offset, Integer limit);
/**
* Vo
* @param
@ -89,6 +89,15 @@ public interface Sign_ListService {
/**
* @description:
* @author linjj
* @date: 2023/11/20 15:23
*/
int addArchiveFinalSign(ArchiveFinalSignVo archiveFinalSignVo);
}

@ -118,6 +118,11 @@ public class CaSignServiceImpl {
}
//添加签章记录
updateCaFileState(idList, failIdList, masterId);
//判断是否存在,存在在先删除
int caMasterId = caSignatureMapper.getCaMasterId(masterId, 1);
if (caMasterId>0){
archiveDetailCaCopyMapper.updateByMasterID(masterId);
}
//签章完后保存新的文件表
archiveDetailCaCopyMapper.addArchiveDetailCaCopyMapper(list);
//签章完成后保存状态

@ -7,6 +7,8 @@
package com.emr.service.ipml;
import com.alibaba.fastjson.JSONArray;
import com.emr.dao.ArchiveFinalSignMapper;
import com.emr.dao.Archive_MasterMapper;
import com.emr.dao.Sign_ListMapper;
import com.emr.entity.*;
import com.emr.service.Emr_DictionaryService;
@ -35,11 +37,15 @@ public class Sign_ListServiceImpl implements Sign_ListService {
@Autowired
private PowerUserService powerUserService;
@Autowired
private ArchiveFinalSignMapper archiveFinalSignMapper;
@Override
public OffsetLimitPage selectSignList(Sign_List_Vo signListVo, Integer offset, Integer limit) {
public OffsetLimitPage selectSignList(ArchiveFinalSignVo archiveFinalSignVo, Integer offset, Integer limit) {
PageHelper.offsetPage(offset, limit);
List<Sign_List_Vo> list = signListMapper.selectSignList(signListVo);
List<ArchiveFinalSignVo> list = archiveFinalSignMapper.getArchiveFinalSignList(archiveFinalSignVo);
// List<Sign_List_Vo> list = signListMapper.selectSignList(signListVo);
if (list != null && list.size() > 0) {
//获取科室列表
Emr_Dictionary dic = new Emr_Dictionary();
@ -48,17 +54,12 @@ public class Sign_ListServiceImpl implements Sign_ListService {
List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
//转换科室
Map<String, Emr_Dictionary> codeMap = ListUtil.toMap(dicList, Emr_Dictionary::getCode);
Setters.<Sign_List_Vo>instance().list(list).cycleSetProperties(p -> {
Setters.<ArchiveFinalSignVo>instance().list(list).cycleSetProperties(p -> {
String deptCode = p.getDeptName();
String deptAdmissionCode = p.getDeptAdmissionTo();
if(StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)){
if (StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)) {
String deptName = codeMap.get(deptCode).getName();
p.setDeptName(deptName);
}
if(StringUtils.isNotBlank(deptAdmissionCode) && codeMap.containsKey(deptAdmissionCode)){
String deptAdmissionTo = codeMap.get(deptAdmissionCode).getName();
p.setDeptAdmissionTo(deptAdmissionTo);
}
});
//查询用户集合
JSONArray powerUsers = powerUserService.getPowerUserList("1");
@ -68,15 +69,15 @@ public class Sign_ListServiceImpl implements Sign_ListService {
powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), Power_User_Dto.class);
}
//遍历赋值
for (Sign_List_Vo sign_list_vo : list) {
for (ArchiveFinalSignVo sign_list_vo : list) {
if (null != powerUserList) {
//获取签收人
String singer = sign_list_vo.getC1();
String singer = sign_list_vo.getSignName();
//遍历匹配工号赋值姓名
for (Power_User_Dto powerUserDto : powerUserList) {
String name = powerUserDto.getName();
if (StringUtils.isNotBlank(singer) && powerUserDto.getUserName().equals(singer)) {
sign_list_vo.setC1(name);
sign_list_vo.setSignName(name);
break;
}
}
@ -84,15 +85,15 @@ public class Sign_ListServiceImpl implements Sign_ListService {
}
//查询签收次数
//masterIds集合
List<String> masterIds = ListUtil.distinctSelect(list, Sign_List_Vo::getMasterID);
List<String> masterIds = ListUtil.distinctSelect(list, ArchiveFinalSignVo::getMasterId);
//转成逗号拼接
String ids = String.join(",", masterIds);
List<Sign_List_Vo> signNum = signListMapper.getSignNum(ids);
//遍历签收次数
Map<String, Sign_List_Vo> signNumMap = ListUtil.toMap(signNum, Sign_List_Vo::getMasterID);
Setters.<Sign_List_Vo>instance().list(list).cycleSetProperties(p -> {
String masterID = p.getMasterID();
if (signNumMap.containsKey(masterID)){
Setters.<ArchiveFinalSignVo>instance().list(list).cycleSetProperties(p -> {
String masterID = p.getMasterId();
if (signNumMap.containsKey(masterID)) {
String num = signNumMap.get(masterID).getNum();
p.setNum(num);
}
@ -229,6 +230,22 @@ public class Sign_ListServiceImpl implements Sign_ListService {
return list;
}
@Override
public int addArchiveFinalSign(ArchiveFinalSignVo archiveFinalSignVo) {
//判断是否存在存在则更新最后时间
String masterId = archiveFinalSignVo.getMasterId();
int idNum = archiveFinalSignMapper.getIdNum(masterId);
//等于0新增
if (idNum == 0) {
return archiveFinalSignMapper.addFinalSign(archiveFinalSignVo);
}
//大于0更新最后签收时间
if (idNum > 0) {
return archiveFinalSignMapper.updateDTimeBymasterId(masterId, archiveFinalSignVo.getDTime(),archiveFinalSignVo.getOperateName());
}
return 0;
}
}

@ -39,6 +39,9 @@
,#{item.pageCount})
</foreach>
</insert>
<update id="updateByMasterID">
delete FROM Archive_Detail_CA_COPY where MasterID=#{masterID}
</update>
<select id="selectByClo" resultMap="BaseResultMap2" resultType="com.emr.entity.Archive_Detail_Vo">

@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.emr.dao.ArchiveFinalSignMapper">
<insert id="addFinalSign">
insert into zd_assort
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="masterId != null">
master_id,
</if>
<if test="inpNo != null">
inp_no,
</if>
<if test="visitId != null">
visit_id,
</if>
<if test="name != null">
name,
</if>
<if test="deptName != null">
dept_name,
</if>
<if test="dischargeDateTime != null">
discharge_date_time,
</if>
<if test="signStatic != null">
sign_static,
</if>
<if test="isscaned != null">
isscaned,
</if>
<if test="operateName != null">
operateName,
</if>
<if test="dTime != null">
dTime,
</if>
<if test="signName != null">
sign_name,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="masterId != null">
#{masterId},
</if>
<if test="inpNo != null">
#{inpNo},
</if>
<if test="visitId != null">
#{visitId},
</if>
<if test="name != null">
#{name},
</if>
<if test="deptName != null">
#{deptName},
</if>
<if test="dischargeDateTime != null">
#{dischargeDateTime},
</if>
<if test="signStatic != null">
#{signStatic},
</if>
<if test="isscaned != null">
#{isscaned},
</if>
<if test="operateName != null">
#{operateName},
</if>
<if test="dTime != null">
#{dTime},
</if>
<if test="signName != null">
#{signName},
</if>
</trim>
</insert>
<update id="updateDTimeBymasterId">
update Archive_Final_Sign set dTime=#{dTime},operateName=#{operateName} where master_id=#{masterId}
</update>
<select id="getIdNum" resultType="java.lang.Integer">
select count(*)
from Archive_Final_Sign
where master_id = #{masterId}
</select>
<select id="getArchiveFinalSignList" resultType="com.emr.entity.ArchiveFinalSignVo">
select * from Archive_Final_Sign
<where> 1=1
<if test="inpNo != null and inpNo != ''">
and inp_no = #{inpNo}
</if>
<if test="visitId != null and visitId != ''">
and visit_id = #{visitId}
</if>
<if test="name != null and name != ''">
and name = #{name}
</if>
<if test="signName != null and signName != ''">
and sign_name = #{signName}
</if>
<if test="deptName!= null and deptName!= ''">
and dept_name in
<foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="operateName != null and operateName != ''">
and operateName = #{operateName}
</if>
<choose>
<when test="startSignDate != null and startSignDate != '' and endSignDate != null and endSignDate != ''">
and dTime between #{startSignDate,jdbcType=NCHAR} and
#{endSignDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
<when test="startSignDate != null and startSignDate != ''">
and dTime >= #{startDate,jdbcType=NCHAR}
</when>
<when test="endSignDate != null and endSignDate != ''">
and dTime &lt;= #{endSignDate,jdbcType=NCHAR}+ ' 23:59:59'
</when>
</choose>
</where>
ORDER BY dTime desc
</select>
</mapper>

@ -3083,31 +3083,28 @@
limit = currPageSize;
this.pageSize = currPageSize;
}
// var url = window.location.href;
// var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
// if (deptName != null && deptName != '') {
// deptName += "," + $("#deptName").val();
// } else {
// deptName = $("#deptName").val();
// }
//
var url = window.location.href;
var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", "");
if (deptName != null && deptName != '') {
deptName += "," + $("#deptName").val();
} else {
deptName = $("#deptName").val();
}
var temp = {
limit: limit, //页面大小
offset: offset, //页码
order: params.order, //排位命令descasc
//id: $("#id").val(),
idNo: $("#idNo").val(),
inpNo: "" + $("#inpNo").val(),
visitId: "" + $("#visitId").val(),
//archivestate: "" + $("#archivestate").val(),
name: "" + $("#name").val(),
c1: "" + $("#signer").val(),
signName: "" + $("#signer").val(),
startSignDate: $("#startSignDate").val(),
endSignDate: $("#endSignDate").val(),
deptName: "" + $("#deptName").val(),
operateName1: "" + $("#operateName1").val(),
deptName: deptName,
operateName: "" + $("#operateName1").val(),
};
return temp;
},
@ -3122,9 +3119,9 @@
align: 'center',
valign: 'middle',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3137,9 +3134,9 @@
valign: 'middle',
visible: false,
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3151,9 +3148,9 @@
align: 'left',
valign: 'middle',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3165,9 +3162,9 @@
align: 'center',
valign: 'middle',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3179,9 +3176,9 @@
align: 'left',
valign: 'middle',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3194,9 +3191,9 @@
align: 'left',
valign: 'middle',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3207,9 +3204,9 @@
field: 'dischargeDateTime',
align: 'center',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3217,7 +3214,7 @@
},
{
title: '签收状态',
field: 'c5',
field: 'signStatic',
align: 'left',
formatter: function (value, row, index) {
//1已签收 2未签收
@ -3243,9 +3240,9 @@
return a;
},
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3281,9 +3278,9 @@
return a;
},
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3291,12 +3288,12 @@
},
{
title: '签收人',
field: 'c1',
field: 'signName',
align: 'left',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3304,7 +3301,7 @@
},
{
title: '签收日期',
field: 'dTime',
field: 'dtime',
align: 'center',
formatter: function (value, row, index) {
if (value != null && value != "") {
@ -3313,9 +3310,9 @@
return value;
},
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3327,9 +3324,9 @@
align: 'center',
valign: 'middle',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};
@ -3341,9 +3338,9 @@
align: 'center',
valign: 'middle',
cellStyle: function (value, row, index) {
var c5 = row.c5;
var signStatic = row.signStatic;
var isscaned = row.isscaned;
if (c5 == 1 && isscaned == 0) {
if (signStatic == 1 && isscaned == 0) {
return {css: {"background-color": "#3B8CFF"}};
}
return {css: {}};

Loading…
Cancel
Save