更新版本20210325增加物理上架信息袋号

master
zengwh 4 years ago
parent 912e0d4085
commit ce13dc1a73

@ -65,7 +65,7 @@ public class PaperPostionService {
}
public void savePaperPostion(Archive_Master_Vo archiveMaster) {
if(StringUtils.isNotBlank(archiveMaster.getPaperPosition()) || StringUtils.isNotBlank(archiveMaster.getPaperPosition1())) {
if(StringUtils.isNotBlank(archiveMaster.getPaperPosition()) || StringUtils.isNotBlank(archiveMaster.getPaperPosition1()) || StringUtils.isNotBlank(archiveMaster.getPaperPosition2()) || StringUtils.isNotBlank(archiveMaster.getPaperPosition3()) || StringUtils.isNotBlank(archiveMaster.getPaperPosition4())) {
EmrPaperPositionInfo obj = new EmrPaperPositionInfo();
BeanUtils.copyProperties(archiveMaster, obj);
updatePaperPostion(obj);
@ -97,14 +97,17 @@ public class PaperPostionService {
}else{
//多个值的用横杠拼接
String paperPosition = obj.getPaperPosition1();
paperPosition += "-";
if(StringUtils.isNotBlank(obj.getPaperPosition2())){
paperPosition += "-" + obj.getPaperPosition2();
paperPosition += obj.getPaperPosition2();
}
paperPosition += "-";
if(StringUtils.isNotBlank(obj.getPaperPosition3())){
paperPosition += "-" + obj.getPaperPosition3();
paperPosition += obj.getPaperPosition3();
}
paperPosition += "-";
if(StringUtils.isNotBlank(obj.getPaperPosition4())){
paperPosition += "-" + obj.getPaperPosition4();
paperPosition += obj.getPaperPosition4();
}
obj.setPaperPosition(paperPosition);
}
@ -148,7 +151,7 @@ public class PaperPostionService {
}
public void updatePaperPostion(EmrPaperPositionInfo obj) {
if(StringUtils.isNotBlank(obj.getPaperPosition()) || StringUtils.isNotBlank(obj.getPaperPosition1())) {
if(StringUtils.isNotBlank(obj.getPaperPosition()) || StringUtils.isNotBlank(obj.getPaperPosition1()) || StringUtils.isNotBlank(obj.getPaperPosition2()) || StringUtils.isNotBlank(obj.getPaperPosition3()) || StringUtils.isNotBlank(obj.getPaperPosition4())) {
//处理纸质信息值带横杠的拆横杠,多个值的用横杠拼接
handlePaperPostion(obj);
//查询是否存在,存在则更新

@ -831,6 +831,9 @@
<if test="inpNo != null and inpNo != ''">
and archive_master.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="paperPosition != null and paperPosition != ''">
and emr_paper_position_info.paper_position like '%'+#{paperPosition,jdbcType=NCHAR}+'%'
</if>
<if test="visitId != null and visitId != ''">
and archive_master.visit_id=#{visitId,jdbcType=NCHAR}
</if>

@ -52,9 +52,6 @@
<insert id="insertSelective" parameterType="com.emr.entity.EmrPaperPositionInfo" >
insert into emr_paper_position_info
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="patientId != null" >
patient_id,
</if>
@ -105,9 +102,6 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=BIGINT},
</if>
<if test="patientId != null" >
#{patientId,jdbcType=NVARCHAR},
</if>

@ -376,7 +376,7 @@
</div>
<footer class="main-footer">
<div class="pull-right">
<b>Version</b> 20210313
<b>Version</b> 20210325
</div>
<strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
reserved.

@ -671,7 +671,7 @@
</div>
</div>
</body>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2021-03-13"></script>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2021-03-25"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-16"></script>
<script src="${path}/static/js/statistics/getDeptCommom.js"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>

@ -102,6 +102,10 @@
<label for="name">终审工号:</label>
<input type="text" class="input-sm form-control" id="checkedDoctor" placeholder="请输入终审工号" maxlength="16">
</div>
<div class="form-group divCss8">
<label for="name">纸质位置:</label>
<input type="text" class="input-sm form-control" id="paperPositionSearch" placeholder="请输入纸质位置关键字" maxlength="16">
</div>
<button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
</div>

@ -44,8 +44,8 @@
</div>
<div class="mainDiv">
<!--搜索-->
<form style="margin-top:5px;margin-bottom: 0!important;">
<div class="form-inline">
<form>
<div class="form-inline" style="margin-left:5px;margin-top:5px;margin-bottom: 0!important;">
<div class="form-group divCss8">
<div class="input-group">
<select class="form-control" id="dateFlag">

@ -399,11 +399,27 @@ $("#verifyBtn").on('click', function () {
show: true//弹出对话框
});
}else{
var ids = $("#archiveId").val();
//只有一个直接提交
//获取柜子列个数
debugger
var paperPostionValueLength = $("#paperPostionValueLength").val();
if(paperPostionValueLength >= 1){
for(var i = 1;i<=paperPostionValueLength;i++) {
//判断是否必填
var document = $("#paperPosition"+i);
var isRequire = document.attr("data");
if(isRequire == 1){
//判断是否为空
var val = document.val();
if(val == ''){
//获取下个节点属性
var text = $("#paperPosition"+i + "_" + i).text();
toastr.warning(text + "不能为空");
document.focus();
return false;
}
}
}
}
//判断是否有扫描纸质
@ -720,6 +736,7 @@ function selectPaperPositonDictionary(){
var id = 'paperPosition'+(i+1);
//获取是否必填 1是0否
var isRequire = data[i].int2;
var labelId = id + '_' + (i+1);
if(inputType == 1){
//选择框
selectValue += '<select id="'+id+'" data="'+isRequire+'"><option value="">请选择</option>';
@ -729,11 +746,11 @@ function selectPaperPositonDictionary(){
selectValue += '<option value="'+typeValues[j]+'">'+typeValues[j]+'</option>';
}
selectValue += '</select>';
selectValue += data[i].typename;
selectValue += '<label id="'+labelId+'">'+data[i].typename+'</label>';
}else if(inputType == 2){
//输入框
selectValue += '<input id="'+id+'" maxlength="16" data="'+isRequire+'"/>';
selectValue += data[i].typename;
selectValue += '<input id="'+id+'" maxlength="16" data="'+isRequire+'" autocomplete="off"/>';
selectValue += '<label id="'+labelId+'">'+data[i].typename+'</label>';
}
}
$("#paperPostionValueLength").val(data.length);

@ -90,7 +90,8 @@ function initTable() {
//archivestate: "" + $("#archivestate").val(),
status:"" + $("#state").val(),
deptName: deptName.toString(),
checkedDoctor:$("#checkedDoctor").val()
checkedDoctor:$("#checkedDoctor").val(),
paperPosition:$("#paperPositionSearch").val()
};
return temp;
},

Loading…
Cancel
Save