diff --git a/doc/gm_record.bak b/doc/gm_record.bak index 060f6af..b5dc053 100644 Binary files a/doc/gm_record.bak and b/doc/gm_record.bak differ diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 18ac3d0..9032243 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -75,7 +75,7 @@ public class ArchiveOtherExtController { */ @RequestMapping("submitUpdate") @ResponseBody - public Msg submitUpdate(String ids,String notNursingIds,String detailIds,String jzh,String masterId,Integer sysFlag) throws Exception{ + public Msg submitUpdate(String ids,String notNursingIds,String detailIds,String jzh,String masterId,Integer sysFlag,HttpServletRequest request) throws Exception{ if(StringUtils.isBlank(ids)){ return Msg.fail("至少选中一个!"); } @@ -87,7 +87,7 @@ public class ArchiveOtherExtController { return Msg.fail("masterId不能为空!"); } } - archiveOtherExtService.updateSubmit(ids,notNursingIds,detailIds,jzh,masterId,sysFlag); + archiveOtherExtService.updateSubmit(ids,notNursingIds,detailIds,jzh,masterId,sysFlag,request); return Msg.success(); } diff --git a/src/main/java/com/emr/entity/ArchiveOtherExtSubmittime.java b/src/main/java/com/emr/entity/ArchiveOtherExtSubmittime.java index b59441d..c7b654b 100644 --- a/src/main/java/com/emr/entity/ArchiveOtherExtSubmittime.java +++ b/src/main/java/com/emr/entity/ArchiveOtherExtSubmittime.java @@ -5,7 +5,7 @@ import java.io.Serializable; public class ArchiveOtherExtSubmittime implements Serializable { private Integer id; - private String otherExtId; + private Long otherExtId; private String createTime; @@ -31,12 +31,12 @@ public class ArchiveOtherExtSubmittime implements Serializable { this.id = id; } - public String getOtherExtId() { + public Long getOtherExtId() { return otherExtId; } - public void setOtherExtId(String otherExtId) { - this.otherExtId = otherExtId == null ? null : otherExtId.trim(); + public void setOtherExtId(Long otherExtId) { + this.otherExtId = otherExtId; } public String getCreateTime() { @@ -97,20 +97,16 @@ public class ArchiveOtherExtSubmittime implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", otherExtId=").append(otherExtId); - sb.append(", createTime=").append(createTime); - sb.append(", int1=").append(int1); - sb.append(", int2=").append(int2); - sb.append(", int3=").append(int3); - sb.append(", str1=").append(str1); - sb.append(", str2=").append(str2); - sb.append(", str3=").append(str3); - sb.append("]"); - return sb.toString(); + return "ArchiveOtherExtSubmittime{" + + "id=" + id + + ", otherExtId=" + otherExtId + + ", createTime='" + createTime + '\'' + + ", int1=" + int1 + + ", int2=" + int2 + + ", int3=" + int3 + + ", str1='" + str1 + '\'' + + ", str2='" + str2 + '\'' + + ", str3='" + str3 + '\'' + + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index 16da8ee..a4643a0 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -1,5 +1,6 @@ package com.emr.service.ipml; +import com.alibaba.fastjson.JSON; import com.emr.dao.ArchiveOtherExtMapper; import com.emr.dao.ArchiveOtherExtSubmittimeMapper; import com.emr.dao.ArchiveOtherMapper; @@ -11,7 +12,6 @@ import com.emr.vo.KeyValue; import net.sf.json.JSONArray; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,8 +52,10 @@ public class ArchiveOtherExtService { //查询护理的最新采集完成时间 String maxETime = archiveOtherExtMapper.selectMaxETimeByNursingAndJzh(archiveOtherExtVo.getJzh()); for(ArchiveOtherExtVo vo : list){ - if(StringUtils.isNotBlank(maxETime)){ - vo.setTempTime(maxETime); + if(vo.getSysflag().equals(1)) { + if (StringUtils.isNotBlank(maxETime)) { + vo.setNursingEndTime(maxETime); + } } //presulit为Done转换为完成 String presult = vo.getPresult(); @@ -107,14 +109,14 @@ public class ArchiveOtherExtService { FileReader fileReader = new FileReader(jsonFile); Reader reader = new InputStreamReader(new FileInputStream(jsonFile),"utf-8"); int ch = 0; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while ((ch = reader.read()) != -1) { sb.append((char) ch); } fileReader.close(); reader.close(); String jsonStr = sb.toString(); - List list = (List) net.sf.json.JSONArray.toList(JSONArray.fromObject(jsonStr), KeyValue.class); + List list = JSON.parseArray(jsonStr,KeyValue.class); return list; } @@ -126,7 +128,7 @@ public class ArchiveOtherExtService { * @param masterId * @param sysFlag */ - public void updateSubmit(String ids,String notNursingIds, String detailIds,String jzh, String masterId, Integer sysFlag) throws Exception{ + public void updateSubmit(String ids,String notNursingIds, String detailIds,String jzh, String masterId, Integer sysFlag,HttpServletRequest request) throws Exception{ String idsStr = splitString2String(ids); String idsTemp = idsStr; //存在护理记录则调用护理按需采集功能 @@ -143,7 +145,7 @@ public class ArchiveOtherExtService { updateCommomSubmit(idsTemp); } //操作提交信息表 - operOtherExtSubmitInfo(ids,idsStr,detailIds); + operOtherExtSubmitInfo(ids,idsStr,detailIds,request); } /** @@ -245,9 +247,13 @@ public class ArchiveOtherExtService { * @param ids 不带单引号的ext_id * @param idsStr 带单引号的ext_id */ - private void operOtherExtSubmitInfo(String ids,String idsStr,String detailIds) { + private void operOtherExtSubmitInfo(String ids,String idsStr,String detailIds,HttpServletRequest request) { //查询ext_id在ext_info表中是否存在 List infoList = archiveOtherExtSubmittimeMapper.selectAllByExtId(idsStr); + //根据ext_ids查询other_ext表的eTime + List archiveOtherExtVos = archiveOtherExtMapper.selectAllByIds(ids); + //获取用户名 + String userName = commomService.getCurrentUserName(request); //定义需要新增的集合 List createList = new ArrayList<>(); //定义需要更新的集合 @@ -260,21 +266,21 @@ public class ArchiveOtherExtService { Date date = new Date(); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); for(int i = 0;i < idArr.length;i++){ - //定义需求操作的对象 - String id = idArr[i]; - ArchiveOtherExtSubmittime objTemp = new ArchiveOtherExtSubmittime(); - objTemp.setCreateTime(fmt.format(date)); - objTemp.setOtherExtId(id); - if(StringUtils.isNoneBlank(detailIdArr[i]) && !"null".equals(detailIdArr[i])) { - objTemp.setStr1(detailIdArr[i]); - } - if(StringUtils.isNotBlank(id)) { + if(StringUtils.isNotBlank(idArr[i])){ + //定义需求操作的对象 + Long id = Long.valueOf(idArr[i]); + ArchiveOtherExtSubmittime objTemp = new ArchiveOtherExtSubmittime(); + objTemp.setCreateTime(fmt.format(date)); + objTemp.setOtherExtId(id); + if(StringUtils.isNoneBlank(detailIdArr[i]) && !"null".equals(detailIdArr[i])) { + objTemp.setStr1(detailIdArr[i]); + } //定义是否存在 boolean flag = false; //判断存在 if(!CollectionUtils.isEmpty(infoList)){ for(ArchiveOtherExtSubmittime obj : infoList){ - String otherExtId = obj.getOtherExtId(); + Long otherExtId = obj.getOtherExtId(); if(id.equals(otherExtId)){ //存在赋值id objTemp.setId(obj.getId()); @@ -283,6 +289,15 @@ public class ArchiveOtherExtService { } } } + //设置最新时间 + for(ArchiveOtherExt archiveOtherExt : archiveOtherExtVos){ + if(archiveOtherExt.getId().equals(id)){ + Date etime = archiveOtherExt.getEtime(); + objTemp.setStr2(fmt.format(etime)); + } + } + //设置工号 + objTemp.setStr3(userName); //存在添加进updateStr,不存在添加进createStr if(flag){ updateList.add(objTemp); @@ -301,6 +316,7 @@ public class ArchiveOtherExtService { } } + /** * 根据ids字段的查询与同步更新比较时间比较较晚时间的集合 * @param ids diff --git a/src/main/java/com/emr/service/ipml/CommomService.java b/src/main/java/com/emr/service/ipml/CommomService.java index c5b1872..bdc89a4 100644 --- a/src/main/java/com/emr/service/ipml/CommomService.java +++ b/src/main/java/com/emr/service/ipml/CommomService.java @@ -10,7 +10,6 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.apache.shiro.util.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,8 +37,6 @@ import java.util.List; public class CommomService { @Value("${POWER_URLHEAD}") private String POWER_URLHEAD; - @Autowired - private StatisticsService statisticsService; /** * 批量添加 * @param tableName 表名 @@ -141,4 +138,28 @@ public class CommomService { } return null; } + + /** + * 获取登录用户对象 + * @param request + * @return + */ + public Power_User getCurrentUser(HttpServletRequest request){ + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + return user; + } + + /** + * 获取登录用户名 + * @param request + * @return + */ + public String getCurrentUserName(HttpServletRequest request){ + Power_User currentUser = getCurrentUser(request); + if(null != currentUser){ + return currentUser.getUserName(); + }else{ + return null; + } + } } diff --git a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java index 197e128..c4331dd 100644 --- a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java +++ b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java @@ -36,4 +36,6 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt { private String assortId; private String tempTime; + + private String nursingEndTime; } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 7052db2..b0a6399 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -2,7 +2,7 @@ #POWER_IP = 192.168.1.3 #POWER_PORT = 8081 -POWER_IP = 200.100.104.40 +POWER_IP = 200.100.104.43 POWER_PORT = 8081 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index b27e1c8..df523b3 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -432,7 +432,8 @@ diff --git a/src/main/resources/mapper/ArchiveOtherExtSubmittimeMapper.xml b/src/main/resources/mapper/ArchiveOtherExtSubmittimeMapper.xml index 59a6166..04391c3 100644 --- a/src/main/resources/mapper/ArchiveOtherExtSubmittimeMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtSubmittimeMapper.xml @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ id, other_ext_id, create_time, int1, int2, int3, str1, str2, str3