diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 4430df8..2ef0d75 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -107,18 +107,6 @@ public class ArchiveOtherExtController { return Msg.fail("masterId不能为空!"); } } -// if (StringUtils.isNotBlank(dzblIds)) { -// List list = Arrays.asList(dzblIds.split(",")); -// for (String taskid : list) { -// HttpRequest.sendGet("http://200.100.104.40:9296/api/noviewtask/MakeUp", "taskid=" + taskid); -// } -// } -// if (StringUtils.isNotBlank(nursingIds)) { -// List list = Arrays.asList(nursingIds.split(",")); -// for (String taskid : list) { -// HttpRequest.sendGet("http://200.100.104.40:9296/api/noviewtask/MakeUp", "taskid=" + taskid); -// } -// } archiveOtherExtService.updateSubmit(ids, notNursingIds, nursingIds, detailIds, jzh, masterId, sysFlag, request); return Msg.success(); } diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index 8068754..55822d7 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -8,6 +8,7 @@ import com.emr.entity.ArchiveOther; import com.emr.entity.ArchiveOtherExt; import com.emr.entity.ArchiveOtherExtSubmittime; import com.emr.entity.OffsetLimitPage; +import com.emr.util.HttpRequest; import com.emr.vo.*; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -58,11 +59,6 @@ public class ArchiveOtherExtService { String maxETime = archiveOtherExtMapper.selectMaxETimeByNursingAndJzh(archiveOtherExtVo.getJzh()); archiveOtherExtVo.setNursingEndTime(maxETime); for (ArchiveOtherExtVo vo : list) { -// String mid = vo.getMid(); -// List archiveCollectTaskVoInfo = archiveOtherExtMapper.getArchiveCollectTaskVoInfo(mid); -// for (ArchiveCollectTaskVo vo1:archiveCollectTaskVoInfo){ -// vo.setMid(vo1.getMasterID()); -// } //遗嘱特殊处理结束时间 operYizhuETime(vo); if (vo.getSysflag().equals(1)) { @@ -169,6 +165,20 @@ public class ArchiveOtherExtService { * @param sysFlag */ public void updateSubmit(String ids,String notNursingIds,String nursingIds, String detailIds,String jzh, String masterId, Integer sysFlag,HttpServletRequest request) throws Exception{ + //文件来源是8走新的医嘱采集器 + if (detailIds.equals("8")){ + //医嘱采集器地址 + String url="http://127.0.0.1:8003/task/repairTaskByCollectId"; + HttpRequest.sendPost(url,"masterId=" + masterId+"&collectId="+detailIds); + return; + } + //文件来源是1走新的护理采集器 + if (detailIds.equals("1")){ + //医嘱采集器地址 + String url="http://127.0.0.1:8003/task/repairTaskByCollectId"; + HttpRequest.sendPost(url,"masterId=" + masterId+"&collectId="+detailIds); + return; + } String idsStr = splitString2String(ids); String idsTemp = idsStr; //存在护理记录则调用护理按需采集功能 @@ -182,15 +192,16 @@ public class ArchiveOtherExtService { archiveOtherExtMapper.updateNursingSubmit(nursingIdTemp); } } - //ext表更新非护理记录 if(StringUtils.isNotBlank(notNursingIds)){ updateCommomSubmit(jzh, masterId,idsTemp); } + //操作提交信息表 operOtherExtSubmitInfo(ids,idsStr,detailIds,request); } +// public void dopost public void taskUpdate(AfCollectTaskUpdateDTO updateDTO) { SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 31ede0e..42ee5b5 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -70,10 +70,7 @@ oraclePassWord = Jswzh #oracleUrl = 127.0.0.1:1521/ORCL #oracleUserName = docus #oraclePassWord = docus702 - calculationTime= 2022/08/01 - - qualitySwitch=2 diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index d763607..533d90f 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -1270,7 +1270,7 @@ function initTable5(data,sidePagination) { events: { 'click .editInfo': function (e, value, row, index) { var ids = row.idTemp; - var sysflag = ''; + var sysflag = row.sysflag; var notNursingIds = row.idTemp; submitUpdate(ids,notNursingIds,sysflag); } @@ -1488,7 +1488,6 @@ function submitUpdate(ids,notNursingIds,detailIds,sysFlag,nursingIds,dzblIds) { data:{ids:ids,notNursingIds:notNursingIds,nursingIds:nursingIds,detailIds:detailIds,jzh:jzh,masterId:$("#idLab").text(),sysFlag:sysFlag,dzblIds:dzblIds}, dataType:'json', success:function (data) { - if(data.code == 100){ toastr.success("同步更新已发送,请耐心等待!"); //刷新列表