diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 461ae4a..1df2139 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -194,12 +194,8 @@ public class beHospitaledController { @ResponseBody @RequestMapping(value = "/checkSuccess") private String checkSuccessMethod(String archiveDetailId){ - //查询完整性 - Archive_Master archiveMaster = archiveMasterService.selectByPrimaryKey(archiveDetailId); - return archiveMaster.getLockinfo(); - /* String result = ""; + String result = ""; String endpoint = HomepageDictionary; - //String endpoint = "http://localhost:8080/ca3/services/caSynrochnized?wsdl"; String method = HomepageMethod; JAXDynamicClientFactory factory = JAXDynamicClientFactory.newInstance(); Client client = null; @@ -218,12 +214,13 @@ public class beHospitaledController { } catch (Exception e) { ExceptionPrintUtil.printException(e); e.printStackTrace(); + result = "失败"; }finally { if(null != client){ client.destroy(); } } - return result;*/ + return result; } diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 514ef41..50bde7a 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; @@ -177,6 +178,19 @@ public class lastVerifyController { return Msg.success().add("ids",ids); } + /** + * 退回扫描 + * @param id + * @param backContent + * @return + * @throws Exception + */ + @ResponseBody + @RequestMapping(value = "/updateDetailByArchivIdForBack") + public Msg updateDetailByArchivIdForBack(String id,@RequestParam("backContent") String backContent) throws Exception{ + archiveMasterService.updateDetailByArchivIdForBack(id,backContent); + return Msg.success(); + } } diff --git a/src/main/java/com/emr/entity/Archive_Master.java b/src/main/java/com/emr/entity/Archive_Master.java index f41ee57..aa32c48 100644 --- a/src/main/java/com/emr/entity/Archive_Master.java +++ b/src/main/java/com/emr/entity/Archive_Master.java @@ -53,6 +53,16 @@ public class Archive_Master { private String t1; + private String c4; + + public String getC4() { + return c4; + } + + public void setC4(String c4) { + this.c4 = c4; + } + public String getT1() { return t1; } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 6ed0845..5b62c32 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -124,6 +124,8 @@ public interface Archive_MasterService { List selectOracleGetSignList(StringBuilder patientIdStr, List selectList); + void updateDetailByArchivIdForBack(String id, String backContent); + //String selectLockInfoByMasterId(String archiveDetailId); } diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index a78a406..75d0c41 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -1297,10 +1297,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return selectList; } - /*@Override - public String selectLockInfoByMasterId(String archiveDetailId) { - return null; - }*/ + @Override + public void updateDetailByArchivIdForBack(String id, String backContent) { + //设置退回扫描信息 + Archive_Master archiveMaster = archiveMasterMapper.selectByPrimaryKey(id); + archiveMaster.setC4(backContent); + archiveMasterMapper.updateById(archiveMaster); + //加入日志 + } } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 976f44b..f29c6a0 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -1,10 +1,10 @@ #power\u6743\u9650\u7CFB\u7EDFIP\u548C\u7AEF\u53E3 -POWER_IP = localhost -POWER_PORT = 8081 - -#POWER_IP = 200.100.104.40 +#POWER_IP = localhost #POWER_PORT = 8081 +POWER_IP = 200.100.104.40 +POWER_PORT = 8081 + #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index ce9e23d..5617e73 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,16 +1,16 @@ #\u6570\u636E\u5E93IP -dataBaseIp=localhost -#\u6570\u636E\u5E93\u540D\u79F0 -dataBaseName=gm_record -#\u6570\u636E\u5E93\u5BC6\u7801 -dataBasePassword=docus702 - -#\u6570\u636E\u5E93IP -#dataBaseIp=200.100.104.40 +#dataBaseIp=localhost ##\u6570\u636E\u5E93\u540D\u79F0 -#dataBaseName=emr_record +#dataBaseName=gm_record ##\u6570\u636E\u5E93\u5BC6\u7801 -#dataBasePassword=AbcXyz123 +#dataBasePassword=docus702 + +#\u6570\u636E\u5E93IP +dataBaseIp=200.100.104.40 +#\u6570\u636E\u5E93\u540D\u79F0 +dataBaseName=emr_record +#\u6570\u636E\u5E93\u5BC6\u7801 +dataBasePassword=AbcXyz123 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName} diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 117cd28..8012df7 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1310,7 +1310,8 @@ DOCTOR_IN_CHARGE = #{doctorInCharge,jdbcType=NVARCHAR}, ID_NO = #{idNo,jdbcType=NVARCHAR}, DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR}, - dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR} + dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR}, + C4 = #{c4,jdbcType=NVARCHAR} where id = #{id,jdbcType=NVARCHAR} diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index e167fd7..feaa90a 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -856,7 +856,7 @@ - - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 8069b5b..9f2bf89 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -110,6 +110,9 @@ .filter-option-inner-inner { font-size: 12px; } + .checkedDiv{ + cursor: pointer; + } - + + \ No newline at end of file diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index f5c5eff..867ba54 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -874,7 +874,7 @@ $("#excelBtn").click(function () { $("#checkSuccessBtn").click(function(){ var masterId = $("#masterId").val(); var result = checkSuccessMethod(masterId); - if(result != ''){ + if(result != '失败'){ $("#wzContent").text(result); //增加完整性刷新后高亮状态 $("#wzContent").addClass("wzContent"); diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index 4eb18d8..e9f102e 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -97,47 +97,19 @@ function returnInfo(status,targetCode,id){ //提交退回信息 $("#returnBtn").on('click', function () { - //退给角色选中个数 - var returnRoleLength = $("input[name='returntoRole']:checked").length; - if(returnRoleLength == 0){ - toastr.warning("退给角色至少选中一个!"); - return; - } - if (validateNum($("#score").val()) && $("#backArchiveId").val() != "") { - var data = {}; - data.archiveDetailId = $("#backArchiveId").val(); - //缺陷信息 - data.content = $("#content").val(); - //选择框checkbox,选中的id - data.assortId = ""; - //jquery获取复选框值 - var arr = []; - $('input[name="Fruit"]:checked').each(function () {//遍历每一个名字为interest的复选框,其中选中的执行函数 - arr.push($(this).val())//将选中的值添加到数组arr中 - }); - if (arr != []) { - data.assortId = arr.toString(); + var backInfoFlag = $("#backInfoFlag").val(); + //backInfoFlag,2:扫描退回;1:审核退回 + if(backInfoFlag == 2){ + var backContent = $("#backContent").val(); + if(backContent == ''){ + toastr.warning('退回内容不能为空'); + return; } - //退回信息 - data.score = $("#score").val(); - var length = $('input[name="returntoRole"]:checked').length; - if(length == 2){ - //退给角色,如果选中两个存ALL - data.returntoRole = 'ALL'; - }else{ - $('input[name="returntoRole"]:checked').each(function () {//遍历每一个名字为interest的复选框,其中选中的执行函数 - data.returntoRole = $(this).val(); - }); - } - data.backContent = $("#backContent").val(); - data.status = $("#status").val(); - data.formToken = $("#formToken1").val(); - data.targetCode = $("#targetCode").val(); //根据病案号保存缺陷信息 $.ajax({ - url: path+"/lastVerify/updateDetailByArchivId", + url: path+"/lastVerify/updateDetailByArchivIdForBack", type: "POST", - data: data, + data: {"id":$("#backArchiveId").val(),"backContent":$("#backContent").val()}, success: function (result) { if (result.code == 100) { //关闭modal @@ -150,8 +122,63 @@ $("#returnBtn").on('click', function () { } } }); - } else { - toastr.warning("评分范围0-100!"); + }else{ + //退给角色选中个数 + var returnRoleLength = $("input[name='returntoRole']:checked").length; + if(returnRoleLength == 0){ + toastr.warning("退给角色至少选中一个!"); + return; + } + if (validateNum($("#score").val()) && $("#backArchiveId").val() != "") { + var data = {}; + data.archiveDetailId = $("#backArchiveId").val(); + //缺陷信息 + data.content = $("#content").val(); + //选择框checkbox,选中的id + data.assortId = ""; + //jquery获取复选框值 + var arr = []; + $('input[name="Fruit"]:checked').each(function () {//遍历每一个名字为interest的复选框,其中选中的执行函数 + arr.push($(this).val())//将选中的值添加到数组arr中 + }); + if (arr != []) { + data.assortId = arr.toString(); + } + //退回信息 + data.score = $("#score").val(); + var length = $('input[name="returntoRole"]:checked').length; + if(length == 2){ + //退给角色,如果选中两个存ALL + data.returntoRole = 'ALL'; + }else{ + $('input[name="returntoRole"]:checked').each(function () {//遍历每一个名字为interest的复选框,其中选中的执行函数 + data.returntoRole = $(this).val(); + }); + } + data.backContent = $("#backContent").val(); + data.status = $("#status").val(); + data.formToken = $("#formToken1").val(); + data.targetCode = $("#targetCode").val(); + //根据病案号保存缺陷信息 + $.ajax({ + url: path+"/lastVerify/updateDetailByArchivId", + type: "POST", + data: data, + success: function (result) { + if (result.code == 100) { + //关闭modal + $('#returnModal').modal('hide'); //手动关闭 + toastr.success("退回成功!"); + //刷新 + $('#table').bootstrapTable('refresh'); + } else { + toastr.error(result.msg); + } + } + }); + } else { + toastr.warning("评分范围0-100!"); + } } }); diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index b31ab17..32a8377 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -237,21 +237,9 @@ function initTable() { }, events: { 'click .returnInfo': function (e, value, row, index) { - setFormToken(); - //console.log("=====退回======"); $("#backArchiveId").val(row.id); $("#status").val(row.archivestate); - $('#form2').find('input,textarea,checkbox').prop('readonly', false); - $('#returnBtn').show(); - //清空标签的内容 - $('#content').val(""); - $('#backContent').val(""); - $('#score').val(""); - $('input[name="returntoRole"]').each(function () { - $(this).prop('checked', false); - }); - $("#faultTypeDiv").empty(); - getFaultType(); + backSetValue(); $('#returnModal').modal({ backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。 keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。 @@ -345,6 +333,94 @@ function initTable() { }); } } +//退回需赋值 +function backSetValue(){ + setFormToken(); + $("#backChecked").empty(); + $("#backInfoForm").empty(); + $("#backInfoFlag").val(1); + $("#backChecked").append(backScanChecked); + $("#backInfoForm").append(backInfo); + $('#form2').find('input,textarea,checkbox').prop('readonly', false); + $('#returnBtn').show(); + //清空标签的内容 + $('#content').val(""); + $('#backContent').val(""); + $('#score').val(""); + $('input[name="returntoRole"]').each(function () { + $(this).prop('checked', false); + }); + $("#faultTypeDiv").empty(); + getFaultType(); +} +//退回扫描选中 +function onClickHander(obj){ + $("#backChecked").empty(); + $("#backInfoForm").empty(); + if(obj.checked){ + $("#backInfoFlag").val(2); + setFormToken(); + $("#backChecked").append(backRoleChecked); + $("#backInfoForm").append(backScanInfo); + } +} +//审核退回 +function onClickHander1(obj){ + if(obj.checked){ + backSetValue(); + } +} +//退回扫描复选框 +var backScanChecked = '
'; +//流程退回复选框 +var backRoleChecked = '
'; +//退回扫描表单 +var backScanInfo = '
\n' + + '
\n' + + ' 内容:\n' + + '
\n' + + '
'; +//流程退回表单 +var backInfo = '\n' + + '
\n' + + '
\n' + + '
缺陷信息
\n' + + '
\n' + + '
\n' + + ' 选项:\n' + + '
\n' + + '
\n' + + '
\n' + + '
\n' + + ' 内容:\n' + + '
\n' + + '
\n' + + '
\n' + + '
\n' + + '
\n' + + '
退回信息
\n' + + '
\n' + + '
\n' + + ' 评分: 分\n' + + '
\n' + + '
\n' + + ' 退给角色:\n' + + ' \n' + + ' \n' + + '
\n' + + '
\n' + + ' 内容:\n' + + '
\n' + + '
\n' + + '
\n' + + '
'; + //确认批量审批列表 function initTable3() { $("#table3").bootstrapTable("destroy"); @@ -363,31 +439,31 @@ function initTable3() { title: '住院号', field: 'inpNo', align: 'left', - valign: 'middle', + valign: 'middle' }, { title: '住院次数', field: 'visitId', align: 'center', - valign: 'middle', + valign: 'middle' }, { title: '姓名', field: 'name', align: 'left', - valign: 'middle', + valign: 'middle' }, { title: '性别', field: 'sex', align: 'center', - valign: 'middle', + valign: 'middle' }, { title: '出院科室', field: 'deptName', align: 'left', - valign: 'middle', + valign: 'middle' }, { title: '出院日期', @@ -400,7 +476,7 @@ function initTable3() { { title: '主管医生', field: 'doctorInCharge', - align: 'left', + align: 'left' }, ], onLoadSuccess: function (result) { //加载成功时执行 @@ -430,7 +506,6 @@ $("#verifyBtn").on('click', function () { var ids = $("#archiveId").val(); //只有一个直接提交 //获取柜子列个数 - debugger var paperPostionValueLength = $("#paperPostionValueLength").val(); if(paperPostionValueLength >= 1){ for(var i = 1;i<=paperPostionValueLength;i++) {