diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 1978d33..bdba7f6 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -37,8 +37,6 @@ public class ArchiveOtherExtController { @RequestMapping("getArchiveExtInfo") @ResponseBody public OffsetLimitPage getArchiveExtInfo(Integer offset, Integer limit, ArchiveOtherExtVo archiveOtherExtVo, HttpServletRequest request){ -// String s = archiveOtherExtVo.getId().toString(); -// archiveOtherExtVo.setMid(s); if(null != offset && null != limit) { PageHelper.offsetPage(offset, limit); } @@ -54,6 +52,7 @@ public class ArchiveOtherExtController { @RequestMapping("getArchiveExtInfoList") @ResponseBody public List getArchiveExtInfoList(ArchiveOtherExtVo archiveOtherExtVo, HttpServletRequest request){ + System.out.println("1::"+archiveOtherExtVo.getJzh()); try { List list = archiveOtherExtService.getArchiveExtInfo(request,archiveOtherExtVo); return list; @@ -95,6 +94,7 @@ public class ArchiveOtherExtController { @RequestMapping("submitUpdate1") @ResponseBody public Msg submitUpdate1(String ids){ + System.out.println("ids+++++"+ids); archiveOtherExtService.updateSubmit1(ids); return Msg.success(); } diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index e58e66c..ffee84d 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -566,6 +566,9 @@ and zd_assort.assort_id = #{assortId,jdbcType=NVARCHAR} + + and archive_other_ext.jzh = #{jzh,jdbcType=NVARCHAR} + order by statusFlagSort diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index e189e6f..29eb400 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -1203,11 +1203,12 @@ function initTable5(data,sidePagination) { }, events: { 'click .editInfo': function (e, value, row, index) { - var id = row.idTemp; - var sysFlagStr =row.sysFlagStr; - var sysFlagArray1 = row.sysFlagArray; - console.log(row.sysFlagArray) - submitUpdate(id,sysFlagStr,sysFlagArray1); + var ids = row.idTemp; + var sysflag = row.sysflag; + var sysFlagStr= []; + sysFlagStr.push(sysflag); + console.log(sysFlagStr) + submitUpdate(ids,sysFlagStr); } } }, @@ -1352,7 +1353,7 @@ var intervalTime = 10 * 1000; //定义倒计时刷新秒数默认5秒 var times = 5; //定义护理倒计时刷新秒数默认900秒(15分钟) -var nurseTimes = 900; +var nurseTimes = 5; $("#loading").css("background","url("+path+"/static/img/load.gif) no-repeat 10px 50%"); //同步更新 var timeInterval; @@ -1404,7 +1405,6 @@ function submitUpdate(ids,sysFlagStr) { var jzh = $("#patientId").val(); var consumeTime = ''; var consumeTImeSum = 0; - var consumeTImeArray = []; $.ajax({ type:'post', url:path+'/archiveExt/submitUpdate1', @@ -1412,35 +1412,60 @@ function submitUpdate(ids,sysFlagStr) { dataType:'json', success:function (data) { if(data.code == 100){ - for (var i = 0; i < sysFlagStr.length; i++){ + for (let i = 0; i < sysFlagStr.length; i++){ switch(sysFlagStr[i]) { - case "护理文书": + case 1://移动护理系统采集服务 consumeTime = 1 break - case "电子病历": + case 2://LIS系统采集服务 consumeTime =1 break - case "Pacs检查": + case 3://PACS系统采集服务 consumeTime =1 break - case "心电图": + case 4://心电系统采集服务 consumeTime =1 break - case "手麻信息": + case 5://手麻系统采集服务 consumeTime =2 break - case "Lis检验": + case 6: consumeTime =1 break - case "病案首页": + case 7://电子病理系统采集服务—首页 consumeTime =3 break - case "长临医嘱": + case 8://电子病理系统采集服务—长临遗嘱 + consumeTime =1 + break + case 9://广东省病案上报统计系统采集服务 consumeTime =2 break + case 10://输血系统采集服务 + consumeTime =1 + break + case 11://神康心理检测报告采集服务 + consumeTime =1 + break + case 12://心里测量报告采集器服务 + consumeTime =2 + break + case 13: + consumeTime =1 + break + case 14: + consumeTime =1 + break + case 15://电子病理系统采集服务—嘉禾美康 + consumeTime =1 + break + case 16: + consumeTime =1 + break } consumeTImeSum +=consumeTime } + toastr.success("同步更新已发送,预计"+consumeTImeSum+"分钟请耐心等待!"); //刷新列表 initTable5('','server'); @@ -1496,14 +1521,15 @@ $("#searchBtn6").click(function(){ var sysFlagArray=[]; for (var i = 0; i < data.length; i++) { - sysFlagArray.push(data[i].sysFlagStr); + sysFlagArray.push(data[i].sysflag); if(ids!=''){ ids += ","; } ids += data[i].idTemp; } + console.log("1"+sysFlagArray) sysFlagArray=unique(sysFlagArray); - console.log(sysFlagArray) + console.log("2"+sysFlagArray) submitUpdate(ids,sysFlagArray); } })