无纸化归档功能修改

master
xuhx 4 years ago
parent 2527a2bdf9
commit ad8ae52f09

@ -103,6 +103,16 @@ public class FontController {
return "font/error";
}
/**
*
* */
@RequestMapping("collection")
private String retrunCollectionPage(Model model, String collectionID){
// System.out.println(System.getProperty("file.encoding"));//当前文件的编码方式
model.addAttribute("collectionID",collectionID);
return "font/collection";
}
/**
* id
* */
@ -363,4 +373,15 @@ public class FontController {
ExceptionPrintUtil.printException(e);
}
}
@ResponseBody
@RequestMapping(value = "getCollectionDetail")
public void getCollectionDetail(HttpServletResponse response,Archive_Detail_Vo ArchiveDetailVo){
response.setCharacterEncoding("utf-8");
try {
archiveDetailService.getCollectionDetail(ArchiveDetailVo);
} catch (Exception e) {
ExceptionPrintUtil.printException(e);
}
}
}

@ -654,6 +654,56 @@ public class signListController {
}
return result;
}
@ResponseBody
@RequestMapping(value = "/collection")
public String collection(HttpServletRequest request, HttpServletResponse response, int flagNum,String id,String pid) throws Exception {
response.setCharacterEncoding("utf-8");
request.setCharacterEncoding("utf-8");
// 从session获取用户名
Subject currentUser = SecurityUtils.getSubject();
Session session = currentUser.getSession();
String result = "";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Sign_List signList = new Sign_List();
signList.setPid(pid);
signList.setMasterID(id);
int num=0;
switch (flagNum){
case 1:
num=-401;
break;
case 2:
num=-402;
break;
case 3:
num=-403;
break;
case 4:
num=-404;
break;
case 5:
num=-405;
break;
case 6:
num=-406;
break;
}
signList.setSysFlag(num);
signList.setC5("0");
List<Sign_List> list=signListService.selectSignListWith(signList);
if(list!=null&&list.size()>0){
return "当前采集计划已存在,请勿重复发起!";
}else{
signList.setId(IDHelper.NewID());
signList.setCreatedtime(sdf.format(new Date()));
signList.setC1((String) session.getAttribute("userSession"));
signList.setIsFullText("0");
signListService.insertSignList(signList);
return "采集计划已生成!";
}
}
}

@ -105,6 +105,13 @@ public interface Archive_DetailMapper {
*/
List<Archive_Detail_Vo> selectByClo(Archive_Detail_Vo record);
/**
*
* @param ArchiveDetailVo
* @return
*/
List<Archive_Detail_Vo> getCollectionDetail(Archive_Detail_Vo ArchiveDetailVo);
/**
*
* @param record

@ -127,6 +127,8 @@ public interface Archive_DetailService {
List<String> mulFile2OneById(HttpServletResponse response,List<Archive_Detail> arList);
void showPdf(HttpServletResponse response, HttpSession session, String pdfWater);
List<Archive_Detail_Vo> getCollectionDetail(Archive_Detail_Vo ArchiveDetailVo);
}

@ -38,6 +38,11 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
return archiveDetailMapper.selectByClo(record);
}
@Override
public List<Archive_Detail_Vo> getCollectionDetail(Archive_Detail_Vo ArchiveDetailVo) {
return archiveDetailMapper.getCollectionDetail(ArchiveDetailVo);
}
@Override
public Integer selectChildByClo(Archive_Detail_Vo record) {
return archiveDetailMapper.selectChildByClo(record);

@ -124,6 +124,20 @@
</if>
</select>
<select id="getCollectionDetail" resultMap="BaseResultMap2" parameterType="com.emr.entity.Archive_Detail_Vo">
select
a.id, a.PDF_PATH, a.MasterID, a.UpLoadDateTime, a.AssortID, a.Source, a.SubAssort, a.Title, a.flag,
a.Sys,a.page_number,a.recover_pdf_path
from
archive_detail a
<if test="flag != null">
and title = #{title,jdbcType=NVARCHAR}
</if>
<if test="flag != null">
and AssortID = #{assortId,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

@ -510,11 +510,11 @@
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>
<if test="isSign != null">
and m.is_sign = #{isSign,jdbcType=NVARCHAR}
<if test="isSign != null ">
and ao.C5 = #{isSign,jdbcType=NVARCHAR}
</if>
<if test="signer != null and signer != ''">
and m.signer like '%'+#{signer,jdbcType=NCHAR}+'%'
and ao.C1 like '%'+#{signer,jdbcType=NCHAR}+'%'
</if>
<choose>
<when test="startSignDate != null and startSignDate != '' and endSignDate != null and endSignDate != ''">

@ -501,6 +501,8 @@
</head>
<body>
<input type="text" value="" id="collectionID" hidden>
<input type="text" value="" id="pid" hidden>
<div id="mb"></div>
<div style="margin-left:30px;margin-right:10px;height:auto">
@ -642,7 +644,7 @@
<%--</div>--%>
<!-- 模态框3Modal查看档案 -->
<div class="modal fade" id="selModal" tabindex="1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal fade" id="selModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header2">
@ -741,6 +743,7 @@
<input type="checkbox" id="flag" value="1">只显示作废</input>
</div>
<div class="col-sm-9 btnGroupCss">
<button type="button" class="btn btn-primary btn-sm" id="collectionBtn">按需采集</button>
<button type="button" class="btn btn-danger btn-sm" id="addPdfBtn">添加pdf</button>
<button type="button" class="btn btn-default btn-sm" id="uploadBtn">上传文件</button>
<button type="button" class="btn btn-info btn-sm" id="pdfBtn">查看分段PDF</button>
@ -801,7 +804,73 @@
</div>
</div>
</div>
<%--按需采集弹窗--%>
<div class="modal fade" id="collectionModal" tabindex="2" role="dialog" aria-hidden="true">
<div class="modal-dialog"style="width:300px">
<div class="modal-content">
<div class="modal-header2">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
&times;
</button>
<h4 class="modal-title">
按需采集详情
</h4>
</div>
<div class="modal-body">
<!--通过审批且未过期的patientId集合-->
<%--<form class="form-horizontal" id="logForm">--%>
<div class="row divCss2">
<div class="form-group">
<label class="col-sm-3 control-label">体温单:</label>
<div class="col-sm-7">
<button type="button" class="btn btn-info btn-sm button1" id="button1" name="button1"style="width:100px">体温单采集 </button>
</div>
</div>
</div>
<div class="row divCss2">
<div class="form-group">
<label class="col-sm-3 control-label">护理记录:</label>
<div class="col-sm-7">
<button type="button" class="btn btn-info btn-sm button2" id="button2" name="button2"style="width:100px">护理记录采集 </button>
</div>
</div>
</div>
<div class="row divCss2">
<div class="form-group">
<label class="col-sm-3 control-label">首页:</label>
<div class="col-sm-7">
<button type="button" class="btn btn-info btn-sm button3" id="button3" name="button3"style="width:100px">首页采集 </button>
</div>
</div>
</div>
<div class="row divCss2">
<div class="form-group">
<label class="col-sm-3 control-label">医生文书:</label>
<div class="col-sm-7">
<button type="button" class="btn btn-info btn-sm button4" id="button4" name="button4"style="width:100px">医生文书采集 </button>
</div>
</div>
</div>
<div class="row divCss2">
<div class="form-group">
<label class="col-sm-3 control-label">护士文书:</label>
<div class="col-sm-7">
<button type="button" class="btn btn-info btn-sm button5" id="button5" name="button5"style="width:100">护士文书采集 </button>
</div>
</div>
</div>
<div class="row divCss2">
<div class="form-group">
<label class="col-sm-3 control-label">评估单:</label>
<div class="col-sm-7">
<button type="button" class="btn btn-info btn-sm button6" id="button6" name="button6" style="width:100px">评估单采集</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 模态框3Modal分段信息 -->
<div class="modal fade" id="assortModal" tabindex="2" role="dialog" aria-hidden="true">
<div class="modal-dialog">
@ -1161,6 +1230,9 @@
</div>
</div>
<iframe id="collection_page" name="collection_page" style="width:1500px;height:640px">
</iframe>
<%--审核弹窗--%>
<div class="modal fade" id="verifyModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
<div class="modal-dialog" role="document">
@ -1409,7 +1481,7 @@
<div id="infoDiv">
<form>
<div class="row " hidden>
<input id="pdfId" hidden/>
<ut id="pdfId" hidden/>
<span style="vertical-align:top;" hidden>pdf路径</span>
<textarea rows="6" style="width:85%;" readonly id="pathPdf" hidden></textarea>
</div>
@ -3446,6 +3518,7 @@
});
}
$("#selQXDoctorBtn").click(function () {
var id = $("#archiveId").val();
backFlagVal = 3;
@ -4015,6 +4088,9 @@
},
'click .selInfo': function (e, value, row, index) {
//ID供按需采集使用
$("#collectionID").val(row.id);
$("#pid").val(row.patientId);
$("#printTableFlag").hide();
if (row.printNum != 0) {
$("#printTableFlag").show();
@ -5022,30 +5098,102 @@
}
});
//添加pdf记录
$("#addPdfBtn").click(function () {
if ($('#inpType').val() != null && $('#inpType').val() != "") {
$("#inpId").val("");
$("#inpTitle").val("");
$("#pageNumber").val(1);
$("#inpSource").val("后台");
$('#addFile').attr("src", "");
$('.inp_file').val(null);
$('#upPdfDiv').show();
$("#pdfPathVal").hide();
$('#addFile').show();
$("#inpType").removeAttr("disabled");
$('#assortModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
$('#pdfPathVal').val("");
//采集体温单
$("#button1").click(function () {
$.ajax({
url: "${path}/signList/collection",
type: "POST",
data: {flagNum: 1,id:$("#collectionID").val(),pid:$("#pid").val()},
success: function (result) {
if (result != null) {
toastr.success(result);
}
}
});
});
//采集护理记录
$("#button2").click(function () {
$.ajax({
url: "${path}/signList/collection",
type: "POST",
data: {flagNum: 2,id:$("#collectionID").val(),pid:$("#pid").val()},
success: function (result) {
if (result != null) {
toastr.success(result);
}
}
});
});
//采集首页
$("#button3").click(function () {
$.ajax({
url: "${path}/signList/collection",
type: "POST",
data: {flagNum: 3,id:$("#collectionID").val(),pid:$("#pid").val()},
success: function (result) {
toastr.success(result);
}
});
});
} else {
toastr.warning("请选择分段类别!");
}
//采集医生文书
$("#button4").click(function () {
$.ajax({
url: "${path}/signList/collection",
type: "POST",
data: {flagNum: 4,id:$("#collectionID").val(),pid:$("#pid").val()},
success: function (result) {
toastr.success(result);
}
});
});
//采集护士文书
$("#button5").click(function () {
$.ajax({
url: "${path}/signList/collection",
type: "POST",
data: {flagNum: 6,id:$("#collectionID").val(),pid:$("#pid").val()},
success: function (result) {
toastr.success(result);
}
});
});
//采集评估单
$("#button6").click(function () {
$.ajax({
url: "${path}/signList/collection",
type: "POST",
data: {flagNum: 5,id:$("#collectionID").val(),pid:$("#pid").val()},
success: function (result) {
if (result != null) {
toastr.success(result);
}
}
});
});
//添加pdf记录
$("#collectionBtn").click(function () {
$('#collectionModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
});
//获取table的高度

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save