emr_medicalrecord_record2.0
/
EMR_Medical_Record
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修正：缺陷类别列表模块和字典列表模块

Browse Source
master
hujl 4 years ago
parent e2794e7e16
commit 3e3a6b3ae6
4 changed files with 243 additions and 189 deletions
Show Stats Download Patch File Download Diff File

40
src/main/java/com/emr/controller/faultTypeController.java
Unescape Escape View File

@ -40,22 +40,40 @@ public class faultTypeController {
@ResponseBody
@RequestMapping(value = "/updateByClo")
public int updateByClo(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Type emrFaultType) throws Exception{
public String updateByClo(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Type emrFaultType) throws Exception{
String result="";
int bol=0;
//判断code是否已经存在
Emr_Fault_Type emrFaultTypeTj=new Emr_Fault_Type();
emrFaultTypeTj.setTypeFlag(emrFaultType.getTypeFlag());
List<Emr_Fault_Type> list=emrFaultTypeService.selectByCol(emrFaultTypeTj);
//判断id是否存在
if(emrFaultType.getId()!=null){
//判断是否存在记录
if (emrFaultTypeService.selectById(emrFaultType.getId()) != null) {
bol = emrFaultTypeService.updateByClo(emrFaultType);
}
}else{
if(emrFaultType.getId()==null && list.size()<1){
//不存在则添加缺陷类别记录
//查询id最大的数据，取id+1作为新id的值
Emr_Fault_Type emrFaultTypeNew=emrFaultTypeService.selectByColDesc();
emrFaultType.setId(emrFaultTypeNew.getId()+1);
bol= emrFaultTypeService.insertClo(emrFaultType);
/* Emr_Fault_Type emrFaultTypeNew=emrFaultTypeService.selectByColDesc();
emrFaultType.setId(emrFaultTypeNew.getId()+1);*/
bol= emrFaultTypeService.insertClo(emrFaultType);
if(bol==1){
result="添加类别成功!";
}else{
result="添加类别失败!";
}
}else if(emrFaultType.getId()!=null && list.size()<2){
//判断是否存在记录
if (emrFaultTypeService.selectById(emrFaultType.getId()) != null) {
bol = emrFaultTypeService.updateByClo(emrFaultType);
if(bol==1){
result="修改类别成功!";
}else{
result="修改类别失败!";
}
}
}else {
result="类别代码不可重复!";
}
return bol;
return result;
}

230
src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp
Unescape Escape View File

@ -21,10 +21,12 @@
vertical-align: middle;
background-color: #2e6da4;
color: #fff;
font-size: 19px;
font-size: 18px;
font-weight: bold;
height: 30px;
height: 35px;
margin-bottom: 10px;
margin-top: 0px;
padding-top: 5px;
}
.treeBtn1 {
@ -54,7 +56,7 @@
/*margin-left: 20px;*/
border-width: 0 0 0 1px;
border-style: solid;
border-color: #2e6da4;
border-color: #aed0ea;
/*background-color: #2e6da4;*/
height: calc(100vh - 0px);
overflow-x: hidden;
@ -110,13 +112,14 @@
#ztree {
margin-top: 10px;
margin-left: -35px;
height: calc(100vh - 180px);
height: calc(100vh - 150px);
overflow: auto;
!important;
}
#searchBtn {
width: 20%;
margin-top: -5px;
!important;
}
</style>
@ -127,8 +130,8 @@
&nbsp;字典列表
</div>
<div class="form-inline ">
<input type="text" id="key" value="" class="input-sm " placeholder="字典名称"/>
<button type="button" class="btn btn-primary btn-sm" id="searchBtn">查询</button>
<input type="text" id="key" value="" class="input-medium form-control" placeholder="字典名称"/>
<button type="button" class="btn btn-primary btn-sm form-control" id="searchBtn">查询</button>
</div>
<div class="row" style="margin-left: 5px;">
<button type="button" class="btn btn-success btn-sm treeBtn1" onclick="expandAll();">全部展开</button>
@ -267,8 +270,7 @@
<label class="col-sm-2 control-label">是否有效：</label>
<div class="col-sm-2">
<select id="effective" class="input-sm form-control">                
<option value="1">有效</option>
               
<option value="1">有效</option>                
<option value="0">无效</option>
</select>
</div>
@ -357,7 +359,91 @@
// return result;
// }
var currId =null;
var deptNodeId=null;
var setting = {
view: {
addHoverDom: false,
removeHoverDom: false,
selectedMulti: false,
autoCancelSelected: false,
fontCss: getFontCss
},
check: {
enable: false
},
data: {
simpleData: {
enable: true,
idKey: "id",
pIdKey: "pId",
rootPId: "0"
}
},
edit: {
enable: false
},
callback: {
beforeClick: function (treeId, treeNode) {
$("#delBtn").show();
$("#saveBtn").show();
$("#allTypeDiv").show();
currNode = treeNode;
//console.log(treeNode.id);
if (treeNode.id != 0) {
if (treeNode.isParent || treeNode.pid == 0 || treeNode.code == null) {
$("#typecode").removeAttr("readOnly");
$("#typename").removeAttr("readOnly");
$("#typecode").val(treeNode.typecode);
$("#typename").val(treeNode.typename);
$("#subTypeDiv").hide();
//$("#addTypeBtn").show();
$("#addBtn").show();
//判断节点是否有叶子节点，有则不可改父级，无则可改动
var childrenNodes = treeNode.children;
/*if(childrenNodes!= undefined){
$("#parentDiv").hide();
}else{
$("#parentDiv").show();
}*/
} else {
$("#typecode").attr("readOnly", "true");
$("#typename").attr("readOnly", "true");
var pNode = treeNode.getParentNode();
$("#typecode").val(pNode.typecode);
$("#typename").val(pNode.typename);
$("#subTypeDiv").show();
//$("#addTypeBtn").hide();
$("#addBtn").hide();
//$("#parentDiv").show();
}
$("#id").val(treeNode.id);
$("#name").val(treeNode.name);
$("#code").val(treeNode.code);
$("#pyCode").val(treeNode.pyCode);
$("#wbCode").val(treeNode.wbCode);
$("#zipCode").val(treeNode.zipCode);
$("#cComment").val(treeNode.cComment);
$("#flag").val(treeNode.flag);
$("#parentId").val("");
$("#effective").val(treeNode.effective);
$("#remark").val(treeNode.remark);
$("#allTypeDiv").show();
} else {
$("#subTypeDiv").removeAttr("display");
$("#addBtn").hide();
$("#delBtn").hide();
$("#saveBtn").hide();
$("#allTypeDiv").hide();
//$("#addTypeBtn").show();
//$("#parentDiv").hide();
emptyEntity(1);
}
}
}
};
function initTree() {
var target = document.getElementById('treediv');
spinner.spin(target);//给id为foo的div 中绑上spinner
@ -376,20 +462,26 @@
//var htmlStr="";
if (result != null) {
for (var i = 0; i < result.length; i++) {
var obj = {};
obj.id = result[i].id;
obj.pid = result[i].parentId;
obj.pId = result[i].parentId;
obj.typecode = result[i].typecode;
obj.code = result[i].code;
if(obj.code==$("#code").val() && $("#code").val()!=undefined){
$("#id").val(obj.id);
currId=obj.id;
}
if (result[i].parentId == 0 || obj.code == null) {
obj.name = result[i].typename.trim();
deptNodeId=result[i].id;
// htmlStr += "<option value=" + result[i].id + ">" + result[i].typename + "</option>";
} else {
obj.name = result[i].name.trim();
// htmlStr += "<option value=" + result[i].id + ">" + result[i].name + "</option>";
}
obj.typename = result[i].typename;
obj.cComment = result[i].cComment;
obj.effective = result[i].effective;
@ -397,7 +489,7 @@
obj.gbCode = result[i].gbCode;
obj.pyCode = result[i].pyCode;
obj.wbCode = result[i].wbCode;
//console.log("obj");
//console.log(obj);
//zNodes=trans_tree(zNodes);
zNodes.push(obj);
if (obj.typecode != null && obj.typecode != "") {
@ -409,12 +501,9 @@
$.fn.zTree.init($("#ztree"), setting, zNodes);
var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
treeObj.expandAll(true);
$("#addBtn").hide();
$("#delBtn").hide();
$("#saveBtn").hide();
$("#parentId").treeSelect(checkNodes);
var node;
var currId = $("#id").val();
if (currId != "" && currId != null) {
//修改选中已选节点
node = treeObj.getNodeByParam("id", currId);
@ -422,18 +511,22 @@
// $("#subTypeDiv").hide();
// $("#allTypeDiv").show();
// $("#addTypeBtn").hide();
} else {
//添加选中父节点
node = treeObj.getNodeByParam("id", 0);
node = treeObj.getNodeByParam("id", deptNodeId);
// $("#addBtn").hide();
// $("#subTypeDiv").show();
// $("#allTypeDiv").hide();
// $("#addTypeBtn").show();
}
currNode = node;
treeObj.selectNode(node, true);//将指定ID的节点选中
$("#addBtn").hide();
if(node!=null || node!=""){
currNode = node;
}else if(currNode==null || currNode==""){
currNode= treeObj.getNodeByParam("id", currNode.id);
}
treeObj.selectNode(currNode, true);//将指定ID的节点选中
$("#"+currNode.tId+"_a").click();//触发ztree点击事件
//$("#addBtn").hide();
spinner.spin();
}, error: function () {
@ -463,89 +556,7 @@
$("#remark").val("");
}
var setting = {
view: {
addHoverDom: false,
removeHoverDom: false,
selectedMulti: false,
autoCancelSelected: false,
fontCss: getFontCss
},
check: {
enable: false
},
data: {
simpleData: {
enable: true,
idKey: "id",
pIdKey: "pId",
rootPId: "0"
}
},
edit: {
enable: false
},
callback: {
beforeClick: function (treeId, treeNode) {
$("#delBtn").show();
$("#saveBtn").show();
$("#allTypeDiv").show();
currNode = treeNode;
//console.log(treeNode.id);
if (treeNode.id != 0) {
if (treeNode.isParent || treeNode.pid == 0 || treeNode.code == null) {
$("#typecode").removeAttr("readOnly");
$("#typename").removeAttr("readOnly");
$("#typecode").val(treeNode.typecode);
$("#typename").val(treeNode.typename);
$("#subTypeDiv").hide();
//$("#addTypeBtn").show();
$("#addBtn").show();
//判断节点是否有叶子节点，有则不可改父级，无则可改动
var childrenNodes = treeNode.children;
/*if(childrenNodes!= undefined){
$("#parentDiv").hide();
}else{
$("#parentDiv").show();
}*/
} else {
$("#typecode").attr("readOnly", "true");
$("#typename").attr("readOnly", "true");
var pNode = treeNode.getParentNode();
$("#typecode").val(pNode.typecode);
$("#typename").val(pNode.typename);
$("#subTypeDiv").show();
//$("#addTypeBtn").hide();
$("#addBtn").hide();
//$("#parentDiv").show();
}
$("#id").val(treeNode.id);
$("#name").val(treeNode.name);
$("#code").val(treeNode.code);
$("#pyCode").val(treeNode.pyCode);
$("#wbCode").val(treeNode.wbCode);
$("#zipCode").val(treeNode.zipCode);
$("#cComment").val(treeNode.cComment);
$("#flag").val(treeNode.flag);
$("#parentId").val("");
$("#effective").val(treeNode.effective);
$("#remark").val(treeNode.remark);
$("#allTypeDiv").show();
} else {
$("#subTypeDiv").removeAttr("display");
$("#addBtn").hide();
$("#delBtn").hide();
$("#saveBtn").hide();
$("#allTypeDiv").hide();
//$("#addTypeBtn").show();
//$("#parentDiv").hide();
emptyEntity(1);
}
}
}
};
// function searchNode() {
@ -718,7 +729,9 @@
initTree();
$("#allTypeDiv").hide();
$("#addBtn").hide();
$("#delBtn").hide();
$("#saveBtn").hide();
// $("#parentDiv").hide();
@ -747,12 +760,12 @@
$("#delBtn").click(function () {
if ($("#id").val() == null || $("#id").val() == "") {
toastr.warning("请选中一个字典节点");
toastr.warning("请选中一个字典节点!");
return;
}
var childrenNodes = currNode.children;
if (childrenNodes && childrenNodes.length > 0) {
console.log(childrenNodes);
//console.log(childrenNodes);
toastr.warning("拥有子节点不可删除!");
return;
}
@ -767,11 +780,13 @@
for (var i = 0, l = nodes.length; i < l; i++) {
ztree.removeNode(nodes[i]);
}
$("#id").val("");
//$("#id").val("");
//添加选中父节点
var node = ztree.getNodeByParam("id", 0);
ztree.selectNode(node, true);//将指定ID的节点选中
currNode = ztree.getNodeByParam("id", deptNodeId);
ztree.selectNode(currNode, true);//将指定ID的节点选中
$("#allTypeDiv").hide();
$("#"+currNode.tId+"_a").click();//触发ztree点击事件
toastr.success("删除成功!")
} else {
toastr.error("删除失败!")
@ -821,6 +836,7 @@
$("#allTypeDiv").show();
$("#subTypeDiv").show();
$("#delBtn").show();
//判断树选中节点，为父节点部分显示，为叶子节点全部显示
//typecode和code不重复

158
src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp
Unescape Escape View File

@ -19,9 +19,13 @@
/*margin-left: 20px;*/
border-width: 0 0 0 1px;
border-style: solid;
border-color: #2e6da4;
border-color: #aed0ea;
/*background-color: #2e6da4;*/
height: calc(100vh - 50px);
height: calc(100vh - 0px);
overflow-x: hidden;
overflow-y: auto;
width: 75%;
float: left;
}
.divCss {
@ -37,12 +41,13 @@
vertical-align: middle;
background-color: #2e6da4;
color: #fff;
font-size: 19px;
font-size: 18px;
font-weight: bold;
height: 30px;
height: 35px;
margin-bottom: 10px;
margin-top: 0px;
width: 115.5%;
padding-top: 5px;
/*width: 115%;*/
}
.treeBtn1 {
@ -75,7 +80,7 @@
#ztree {
margin-top: 10px;
margin-left: -35px;
height: calc(100vh - 180px);
height: calc(100vh - 150px);
overflow: auto;
!important;
}
@ -83,6 +88,9 @@
#leftCol {
background-color: #fff;
height: calc(100vh - 20px);
width: 24%;
float: left;
margin-left: 10px;
!important;
}
@ -96,18 +104,21 @@
#searchBtn {
width: 20%;
margin-top: -5px;
!important;
}
</style>
</head>
<body>
<div class="col-md-3" id="leftCol">
<div id="leftCol">
<div class="row titleCss">
&nbsp;缺陷类别列表
</div>
<div class="row form-inline">
<input type="text" id="key" value="" class="input-sm empty" placeholder="缺陷类别名称"/>
<button type="button" class="btn btn-primary btn-sm" id="searchBtn">查询</button>
<input type="text" id="key" value="" class="input-medium form-control" placeholder="缺陷类别名称"/>
<button type="button" class="btn btn-primary btn-sm form-control" id="searchBtn">查询</button>
</div>
<div class="row">
<button type="button" class="btn btn-success btn-sm treeBtn1" onclick="expandAll();">全部展开</button>
@ -121,84 +132,85 @@
</div>
</div>
<!--内容-->
<div class="col-md-8 content">
<div class="content">
<div class="row titleCss">
&nbsp;缺陷类别信息
</div>
<form id="form1">
<form id="form1" >
<div class="row">
<button type="button" class="btn btn-primary btn-sm" id="saveBtn">保存类别</button>
<button type="button" class="btn btn-danger btn-sm" id="delBtn">删除类别</button>
<button type="button" class="btn btn-warning btn-sm" id="addBtn">添加类别</button>
</div>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">类别代码：</label>
<div class="col-sm-10"><input type="text" hidden id="id" name="id">
<input type="text" class="input-sm form-control" id="typeFlag" name="typeFlag">
<div id="contentDiv" hidden>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">类别代码：</label>
<div class="col-sm-10"><input type="text" hidden id="id" name="id">
<input type="text" class="input-sm form-control" id="typeFlag" name="typeFlag">
</div>
<div class="col-sm-1"></div>
</div>
<div class="col-sm-1"></div>
</div>
</div>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">类别名称：</label>
<div class="col-sm-10">
<input type="text" class="input-sm form-control" id="typeName" name="typeName">
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">类别名称：</label>
<div class="col-sm-10">
<input type="text" class="input-sm form-control" id="typeName" name="typeName">
</div>
<div class="col-sm-1"></div>
</div>
<div class="col-sm-1"></div>
</div>
</div>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">分值：</label>
<div class="col-sm-4">
<input type="text" class="input-sm form-control" id="price" name="price">
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">分值：</label>
<div class="col-sm-4">
<input type="text" class="input-sm form-control" id="price" name="price">
</div>
<div class="col-sm-1"></div>
</div>
<div class="col-sm-1"></div>
</div>
</div>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">类别排序：</label>
<div class="col-sm-4">
<input type="number" class="input-sm form-control" id="typeSort" name="typeSort">
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">类别排序：</label>
<div class="col-sm-4">
<input type="number" class="input-sm form-control" id="typeSort" name="typeSort" value="100">
</div>
<div class="col-sm-1"></div>
</div>
<div class="col-sm-1"></div>
</div>
</div>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">是否有效：</label>
<div class="col-sm-2">
<select id="effective" class="input-sm form-control">                
<option value="1">有效</option>
               
<option value="0">无效</option>
</select>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">是否有效：</label>
<div class="col-sm-2">
<select id="effective" class="input-sm form-control">                
<option value="1">有效</option>                
<option value="0">无效</option>
</select>
</div>
<div class="col-sm-1"></div>
</div>
<div class="col-sm-1"></div>
</div>
</div>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">备注：</label>
<div class="col-sm-10">
<textarea class="input-sm form-control" rows="5" id="remark" name="recallReason"></textarea>
<div class="row divCss">
<div class="form-group">
<label class="col-sm-2 control-label">备注：</label>
<div class="col-sm-10">
<textarea class="input-sm form-control" rows="5" id="remark" name="recallReason"></textarea>
</div>
<div class="col-sm-1"></div>
</div>
<div class="col-sm-1"></div>
</div>
</div>
<%--<div style="margin-left:30px;margin-top: 50px;">
<%--<div style="margin-left:30px;margin-top: 50px;">
</div>--%>
</div>--%>
</div>
</form>
</div>
<script type="text/javascript">
var zNodes = [];
var nodeList = [];
var currId =null;
function initTree() {
zNodes = [];
//获取所有缺陷类别列表
@ -217,6 +229,12 @@
obj.name = result[i].typeName;
obj.price = result[i].price;
obj.typeFlag = result[i].typeFlag;
if(obj.typeFlag==$("#typeFlag").val() && $("#typeFlag").val()!=undefined && $("#typeFlag").val()!=""){
currId=obj.id;
$("#id").val(obj.id);
}else if($("#id").val()!="" && $("#id").val()!=undefined){
currId = $("#id").val();
}
obj.typeSort = result[i].typeSort;
obj.remark = result[i].remark;
obj.effective = result[i].effective;
@ -227,7 +245,7 @@
var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes);
$("#delBtn").hide();
var node;
var currId = $("#id").val();
//console.log("====currId====="+currId);
if (currId != "" && currId != null) {
//修改选中已选节点
node = treeObj.getNodeByParam("id", currId);
@ -250,7 +268,7 @@
$("#typeName").val("");
$("#price").val(0);
$("#effective").val(1);
$("#typeSort").val("");
$("#typeSort").val("100");
$("#remark").val("");
}
@ -278,7 +296,7 @@
callback: {
beforeClick: function (treeId, treeNode) {
if (treeNode.id != 0) {
$("#form1").show();
$("#contentDiv").show();
$("#id").val(treeNode.id);
$("#typeFlag").val(treeNode.typeFlag);
if (treeNode.typeFlag == "defined") {
@ -295,7 +313,7 @@
$("#effective").val(treeNode.effective);
$("#remark").val(treeNode.remark);
} else {
//$("#form1").hide();
//$("#contentDiv").hide();
$("#delBtn").hide();
emptyEntity();
}
@ -459,7 +477,9 @@
//添加选中父节点
var node = ztree.getNodeByParam("id", 0);
ztree.selectNode(node, true);//将指定ID的节点选中
$("#form1").hide();
$("#contentDiv").hide();
$("#delBtn").hide();
// $("#"+currNode.tId+"_a").click();//触发ztree点击事件
toastr.success("删除成功!")
} else {
toastr.error("删除失败!")
@ -470,6 +490,7 @@
});
});
$("#addBtn").click(function () {
$("#contentDiv").show();
emptyEntity();
});
@ -500,13 +521,12 @@
type: "POST",
data: entity,
success: function (result) {
if (result == 1) {
toastr.success("修改成功!");
if (result.indexOf("成功") != -1) {
toastr.success(result);
initTree();
} else {
toastr.error("修改失败!");
toastr.warning(result);
}
}, error: function () {
toastr.error("加载失败!")
}

4
src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp
Unescape Escape View File

@ -668,7 +668,7 @@
}
}, error: function () {
//刷新
toastr.error("封存异常111!!")
toastr.error("封存异常!!")
}
});
});
@ -695,7 +695,7 @@
}
}, error: function () {
//刷新
toastr.error("封存异常111!!")
toastr.error("封存异常!!")
}
});
});

Write Preview
Loading…
Cancel
Save