diff --git a/pom.xml b/pom.xml index 490553f..fc7d08b 100644 --- a/pom.xml +++ b/pom.xml @@ -224,16 +224,6 @@ fastjson ${fastjson.version} - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index e18af78..e63e396 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -197,6 +197,30 @@ public class lastVerifyController { return Msg.success().add("ids", ids); } + + + @ResponseBody + @RequestMapping(value = "/updateReturnCmtDoctor") + public Msg updateReturnCmtDoctor(String id){ + int i = archiveMasterService.updateReturnCmtDoctor(id); + if (i==1){ + return Msg.success(); + } + return Msg.fail(); + } + + + + @ResponseBody + @RequestMapping(value = "/updateReturnCmtNurse") + public Msg updateReturnCmtNurse(String id){ + int i = archiveMasterService.updateReturnCmtNurse(id); + if (i==1){ + return Msg.success(); + } + return Msg.fail(); + } + } diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index 8c97d40..2f4bbee 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -150,4 +150,9 @@ public interface Archive_MasterMapper { List getFailList(@Param("scheduledFlag")String scheduledFlag); + int updateReturnCmtDoctor(@Param("id")String id); + + int updateReturnCmtNurse(@Param("id")String id); + + } \ No newline at end of file diff --git a/src/main/java/com/emr/quartz/ScheduledJob.java b/src/main/java/com/emr/quartz/ScheduledJob.java index d4a1492..7a46117 100644 --- a/src/main/java/com/emr/quartz/ScheduledJob.java +++ b/src/main/java/com/emr/quartz/ScheduledJob.java @@ -6,11 +6,15 @@ import com.emr.dao.Archive_MasterMapper; import com.emr.entity.Archive_Master; import com.emr.util.RedisMq; import com.emr.vo.PrintParam; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -23,6 +27,7 @@ import java.util.List; */ @Component +@Slf4j public class ScheduledJob { private String redisKey = "docus:task:topic_collect_%s_queue:%s"; @@ -33,14 +38,20 @@ public class ScheduledJob { private String scheduledFlag; @Autowired private Archive_MasterMapper archiveMasterMapper; + + private final static Logger logger = LoggerFactory.getLogger(ScheduledJob.class); /** * @description: 采集器失败任务补偿重新加入队列 * @author linjj * @date: 2023/12/14 16:54 */ - @Scheduled(cron = "0 0 1 * * ?") + @Scheduled(cron = "${quartzTime}") public void repairTaskAll() { + Date date = new Date(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String newDate = format.format(date); //查询采集未完成患者继续采集 + logger.info(newDate+"开始补偿病历"); List failList = archiveMasterMapper.getFailList(scheduledFlag); for (Archive_Master list:failList){ PrintParam printParam = new PrintParam(); @@ -52,6 +63,7 @@ public class ScheduledJob { printParam.setName(list.getName()); GenerateQueue(printParam,1,list.getSysFlag()); } + logger.info("本次补偿："+failList.size()+"本病历"); } @@ -59,7 +71,6 @@ public class ScheduledJob { private void GenerateQueue(PrintParam data, Integer ispriority, String collectid) { String key = String.format(redisKey, collectid, ispriority); redisMq.push(key, JSON.toJSONString(data, SerializerFeature.WriteDateUseDateFormat, SerializerFeature.WriteMapNullValue)); - } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 05106e0..e359633 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -145,6 +145,11 @@ public interface Archive_MasterService { //String selectLockInfoByMasterId(String archiveDetailId); + + int updateReturnCmtDoctor(String id); + + + int updateReturnCmtNurse(String id); } 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 c25f24d..a000093 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -36,7 +36,7 @@ import java.util.*; /** * @author zwh - * */ + */ @Service @Transactional public class Archive_MasterServiceImpl implements Archive_MasterService { @@ -64,37 +64,38 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Autowired private TUuPrintMapper tUuPrintMapper; @Autowired - private Archive_MasterMapper archive_masterMapper; + private Archive_MasterMapper archive_masterMapper; + /** * 在院列表 - * */ + */ @Override public OffsetLimitPage selectByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); - List list= archiveMasterMapper.selectByCol(archiveMasterVo); + List list = archiveMasterMapper.selectByCol(archiveMasterVo); return new OffsetLimitPage((Page) list); } /** * 出院列表 - * */ + */ @Override - public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request) { + public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit, HttpServletRequest request) { //设置查询条件审核角色 setInfoId(archiveMasterVo); //设置登录用户 - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); - if(user.getRoleId() != -100 && user.getRoleId() != 0 ){ + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); + if (user.getRoleId() != -100 && user.getRoleId() != 0) { archiveMasterVo.setUserName(user.getUserName()); } //查询 - List list = selectByColumn(offset, limit,archiveMasterVo,request); + List list = selectByColumn(offset, limit, archiveMasterVo, request); return new OffsetLimitPage((Page) list); } @Override - public OffsetLimitPage selectMasterByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,HttpServletRequest request) { + public OffsetLimitPage selectMasterByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit, HttpServletRequest request) { //设置查询条件审核角色 //setInfoId(archiveMasterVo); //设置登录用户 @@ -106,22 +107,22 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { archiveMasterVo.setDeptName(obj.getString("deptCode")); }*/ //查询 - List list = selectByColumn(offset, limit,archiveMasterVo,request); + List list = selectByColumn(offset, limit, archiveMasterVo, request); return new OffsetLimitPage((Page) list); } @Override - public List getDoctorInCharge(Archive_Master record,HttpServletRequest request)throws Exception { + public List getDoctorInCharge(Archive_Master record, HttpServletRequest request) throws Exception { //设置登录用户 - Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); //查该登录工号绑定的科室下面的患者，且只能查在院患者 - String requestUrl =POWER_URLHEAD + "/ssoLogin/getUser?userName="+user.getUserName(); + String requestUrl = POWER_URLHEAD + "/ssoLogin/getUser?userName=" + user.getUserName(); //List userList = commomService.getUserList(); JSONObject obj = HttpClientUtils.httpGet(requestUrl); - if(obj!=null) { + if (obj != null) { record.setDeptName(obj.getString("deptCode")); } - List returnList=archiveMasterMapper.getDoctorInCharge(record); + List returnList = archiveMasterMapper.getDoctorInCharge(record); /*//替换姓名 for (Archive_Master archiveMasterList : returnList) { if (!CollectionUtils.isEmpty(userList)) { @@ -138,13 +139,25 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return archiveMasterMapper.getDoctorInCharge(record); } + @Override + public int updateReturnCmtDoctor(String id) { + return archiveMasterMapper.updateReturnCmtDoctor(id); + } + + @Override + public int updateReturnCmtNurse(String id) { + return archiveMasterMapper.updateReturnCmtNurse(id); + } + + /** * //循环遍历list集合判断是否完整，完整isCheck赋值1，且批量更新LockInfo字段为完整 + * * @param list */ private void updateMasterBySuccess(List list) { //list集合的分组分类集合 - if(!CollectionUtils.isEmpty(list)){ + if (!CollectionUtils.isEmpty(list)) { //获取资料完整的masterIds String masterIds = getMasterIdsByList(list); Archive_Master_Vo masterVo = new Archive_Master_Vo(); @@ -152,9 +165,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { masterVo.setIsSuccess("1"); //查询自定义的完整性的masterIds集合 List selectCompleteMasterIds = archiveMasterMapper.selectCompleteMasterIds(masterVo); - if(!CollectionUtils.isEmpty(selectCompleteMasterIds)) { + if (!CollectionUtils.isEmpty(selectCompleteMasterIds)) { //将暂时赋值完整的isSuccess = 1 - setIsSuccess(selectCompleteMasterIds,list); + setIsSuccess(selectCompleteMasterIds, list); //获取mastertIds集合 masterIds = getMasterIdsByList(selectCompleteMasterIds); List selectNotInspectionList = null; @@ -168,7 +181,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //循环遍历list集合判断是否完整，完整isCheck赋值1，且批量更新LockInfo字段为完整 //定义通过完整性校验的masterIds StringBuilder masterIdsTemp = new StringBuilder(); - for(Archive_Master_Vo master : list) { + for (Archive_Master_Vo master : list) { //定义检验检查报告分类是完整的 boolean inspectionFlag = false; //判断不存在缺少校验检查分类 @@ -212,13 +225,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 暂时设置完整isSuccess = 1 + * * @param selectCompleteMasterIds * @param list */ private void setIsSuccess(List selectCompleteMasterIds, List list) { - for(Archive_Master_Vo vo : list){ - for(Archive_Master_Vo vo1 : selectCompleteMasterIds){ - if(vo.getId().equals(vo1.getId())){ + for (Archive_Master_Vo vo : list) { + for (Archive_Master_Vo vo1 : selectCompleteMasterIds) { + if (vo.getId().equals(vo1.getId())) { vo.setIsSuccess("1"); break; } @@ -228,6 +242,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 组织masterIds集合 + * * @param list * @return */ @@ -244,7 +259,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 未归档列表 - * */ + */ @Override public OffsetLimitPage selectByUnfile(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); @@ -254,7 +269,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 终审列表 - * */ + */ @Override public OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); @@ -264,16 +279,16 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Override public int addPaperStatic(String id, int paperStatic) { - return archiveMasterMapper.addPaperStatic(id,paperStatic); + return archiveMasterMapper.addPaperStatic(id, paperStatic); } /** * 查询终审页面列表 - * */ + */ @Override - public List selectLastVerifyList(Archive_Master_Vo archiveMasterVo){ + public List selectLastVerifyList(Archive_Master_Vo archiveMasterVo) { List list = archiveMasterMapper.selectByLast(archiveMasterVo); - if(null != list && !list.isEmpty()){ + if (null != list && !list.isEmpty()) { //查询科室集合 Emr_Dictionary dictionary = new Emr_Dictionary(); dictionary.setTypecode("dept_code"); @@ -283,9 +298,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { deptNameCode2Name(dictionaries, masterVo); //状态均为护士长已质控，取出一个对象，转换中文状态 Integer status = Integer.valueOf(masterVo.getArchivestate()); - if(status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())){ + if (status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())) { masterVo.setStatus(EnumVerify.DocState.HeadNurseCheck.getName()); - }else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){ + } else if (status.equals(EnumVerify.DocState.CallBacked.getCode())) { masterVo.setStatus(EnumVerify.DocState.CallBacked.getName()); } } @@ -306,11 +321,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 已归档 * 病案终审退回页面 - * */ + */ @Override - public OffsetLimitPage selectFiled(Archive_Master_Vo master,Integer offset, Integer limit) { + public OffsetLimitPage selectFiled(Archive_Master_Vo master, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); - List list= archiveMasterMapper.selectFiled(master); + List list = archiveMasterMapper.selectFiled(master); return new OffsetLimitPage((Page) list); } @@ -320,10 +335,10 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } @Override - public List selectByColumn(Integer offset, Integer limit,Archive_Master_Vo archiveMasterVo,HttpServletRequest request) { + public List selectByColumn(Integer offset, Integer limit, Archive_Master_Vo archiveMasterVo, HttpServletRequest request) { //分是否按完整性查询 List list = null; - if(null != offset && null != limit) { + if (null != offset && null != limit) { PageHelper.offsetPage(offset, limit); } list = archiveMasterMapper.selectByColumn(archiveMasterVo); @@ -335,9 +350,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { deptNameCode2Name(dictionaries, masterVo); //状态均为护士长已质控，取出一个对象，转换中文状态 Integer status = Integer.valueOf(masterVo.getArchivestate()); - if(status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())){ + if (status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())) { masterVo.setStatus(EnumVerify.DocState.HeadNurseCheck.getName()); - }else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){ + } else if (status.equals(EnumVerify.DocState.CallBacked.getCode())) { masterVo.setStatus(EnumVerify.DocState.CallBacked.getName()); } } @@ -347,8 +362,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { if (null != role) { Iterator var8 = list.iterator(); - while(var8.hasNext()) { - Archive_Master_Vo masterVo = (Archive_Master_Vo)var8.next(); + while (var8.hasNext()) { + Archive_Master_Vo masterVo = (Archive_Master_Vo) var8.next(); String archivestate = masterVo.getArchivestate(); if (StringUtils.isNotBlank(archivestate)) { boolean numeric = this.isNumeric(archivestate); @@ -370,11 +385,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 带完整性查询的出院记录查询 + * * @param archiveMasterVo * @return */ - private List selectBeHospitalByIsSuccess(Integer offset,Integer limit,Archive_Master_Vo archiveMasterVo) { - if(null != offset && null != limit) { + private List selectBeHospitalByIsSuccess(Integer offset, Integer limit, Archive_Master_Vo archiveMasterVo) { + if (null != offset && null != limit) { PageHelper.offsetPage(offset, limit); } return archiveMasterMapper.selectCompleteMasterIds(archiveMasterVo); @@ -382,14 +398,15 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 设置审核角色 + * * @param archiveMasterVo */ private void setInfoId(Archive_Master_Vo archiveMasterVo) { String status = archiveMasterVo.getStatus(); //取最大值 String archivestate = archiveMasterVo.getArchivestate(); - if(StringUtils.isNotBlank(status) && StringUtils.isNotBlank(archivestate)){ - if ("1".equals(archivestate)){ + if (StringUtils.isNotBlank(status) && StringUtils.isNotBlank(archivestate)) { + if ("1".equals(archivestate)) { //已审核，取最大 Integer maxStatus = 0; String[] statusArr = status.split(","); @@ -402,8 +419,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } } } - archiveMasterVo.setStatus(maxStatus+""); - }else{ + archiveMasterVo.setStatus(maxStatus + ""); + } else { //待审核，取带逗号的字符串的数 archiveMasterVo.setStatus(status); } @@ -416,26 +433,26 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { * @param list */ private void selectByColumnChange(List list) { - if(!CollectionUtils.isEmpty(list)){ + if (!CollectionUtils.isEmpty(list)) { //查询科室集合 Emr_Dictionary dictionary = new Emr_Dictionary(); dictionary.setTypecode("dept_code"); List dictionaries = dictionaryMapper.dicByTypeCode(dictionary); //查询出院天数 List selectDays = new ArrayList<>(); - if(list.size() > 200){ + if (list.size() > 200) { selectDays = archiveMasterMapper.selectDaysByMasterIds(null); - }else{ - selectDays = archiveMasterMapper.selectDaysByMasterIds(list); + } else { + selectDays = archiveMasterMapper.selectDaysByMasterIds(list); } - for (Archive_Master_Vo vo:list) { + for (Archive_Master_Vo vo : list) { //科室名称编码转名称 deptNameCode2Name(dictionaries, vo); //赋值出院天数 - if(!CollectionUtils.isEmpty(selectDays)){ - for(Archive_Master_Vo days : selectDays){ - if(days.getId().equals(vo.getId())){ + if (!CollectionUtils.isEmpty(selectDays)) { + for (Archive_Master_Vo days : selectDays) { + if (days.getId().equals(vo.getId())) { vo.setDays(days.getDays()); break; } @@ -447,11 +464,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 科室名称编码转名称 + * * @param dictionaries 科室字典列表 - * @param vo 患者记录对象 + * @param vo 患者记录对象 */ private void deptNameCode2Name(List dictionaries, Archive_Master_Vo vo) { - if(!CollectionUtils.isEmpty(dictionaries)) { + if (!CollectionUtils.isEmpty(dictionaries)) { //在院科室 String deptAdmissionTo = vo.getDeptAdmissionTo(); //出院科室 @@ -471,26 +489,28 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //验证字符串是否是数字 @Override - public boolean isNumeric(String str){ - for (int i = 0; i < str.length(); i++){ - if (!Character.isDigit(str.charAt(i))){ + public boolean isNumeric(String str) { + for (int i = 0; i < str.length(); i++) { + if (!Character.isDigit(str.charAt(i))) { return false; } } return true; } + /** * 处理已审批查询时的节点id,且是多个的 + * * @param archiveMasterVo * @return */ - private void setMaxRoleId(Archive_Master_Vo archiveMasterVo){ + private void setMaxRoleId(Archive_Master_Vo archiveMasterVo) { String status = archiveMasterVo.getStatus(); //取最大值 String archivestate = archiveMasterVo.getArchivestate(); - if(StringUtils.isNotBlank(status) && StringUtils.isNotBlank(archivestate)){ + if (StringUtils.isNotBlank(status) && StringUtils.isNotBlank(archivestate)) { //查询已审批才处理 - if("1".equals(archivestate) && status.contains(",")) { + if ("1".equals(archivestate) && status.contains(",")) { Integer maxStatus = 0; String[] statusArr = status.split(","); for (String statu : statusArr) { @@ -503,7 +523,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } } //设置角色index - archiveMasterVo.setStatus(maxStatus+""); + archiveMasterVo.setStatus(maxStatus + ""); } } } @@ -512,10 +532,10 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public List selectByUnfile(Archive_Master_Vo archiveMasterVo) { List list = archiveMasterMapper.selectByUnfile(archiveMasterVo); //根据状态code转换状态及判断显示按钮 - if(null != list && !list.isEmpty()){ + if (null != list && !list.isEmpty()) { //计算属于哪种审核角色 Msg role = getRole(); - if(null != role) { + if (null != role) { for (Archive_Master_Vo master_vo : list) { String archivestate = master_vo.getArchivestate(); String dischargeDateTime = master_vo.getDischargeDateTime(); @@ -543,14 +563,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 获取审核按钮和退回按钮集合 - * */ - private String getBtns(Integer status,List roles,String id){ + */ + private String getBtns(Integer status, List roles, String id) { String btns = ""; //获取用户功能权限信息 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); Set menus = user.getMenus(); - if(null != menus && !menus.isEmpty()) { + if (null != menus && !menus.isEmpty()) { //医生提交权限标识 String doctorSumbit = "/beHosp/doctorSumbit"; //医生质控员质控权限标识 @@ -582,25 +602,25 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //遍历，判断拥有权限，拥有护士长权限立即返回4，拥有医生支线赋值doctorRole=1,拥有护士支线赋值nurseRole=1 for (String menu : menus) { if (StringUtils.isNotBlank(menu)) { - if (menu.equals(doctorSumbit+"")) { + if (menu.equals(doctorSumbit + "")) { doctorSumbitPower = 1; } - if (menu.equals(doctorCheckSumbit+"")) { + if (menu.equals(doctorCheckSumbit + "")) { doctorCheckSumbitPower = 1; } - if (menu.equals(directorCheckSumbit+"")) { + if (menu.equals(directorCheckSumbit + "")) { directorCheckSumbitPower = 1; } - if (menu.equals(nurseSumbit+"")) { + if (menu.equals(nurseSumbit + "")) { nurseSumbitPower = 1; } - if (menu.equals(nurseCheckSumbit+"")) { + if (menu.equals(nurseCheckSumbit + "")) { nurseCheckSumbitPower = 1; } - if (menu.equals(headNurseCheck+"")) { + if (menu.equals(headNurseCheck + "")) { headNurseCheckPower = 1; } - if (menu.equals(backSumbit+"")) { + if (menu.equals(backSumbit + "")) { backPower = 1; } } @@ -626,22 +646,22 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //定义护士长质控是否有效 int headNurseCheckEffective = 0; for (ArchiveFlowRole flowRole : roles) { - if(flowRole.getCode().equals(EnumVerify.DocState.HeadNurseCheck.getCode()+"")){ + if (flowRole.getCode().equals(EnumVerify.DocState.HeadNurseCheck.getCode() + "")) { headNurseSumbitName = flowRole.getSumbitName(); headNurseCheckEffective = flowRole.getEffective(); - }else if(flowRole.getCode().equals(EnumVerify.DocState.DortorSubmit.getCode()+"")){ + } else if (flowRole.getCode().equals(EnumVerify.DocState.DortorSubmit.getCode() + "")) { doctorSumbitName = flowRole.getSumbitName(); doctorSubmitEffective = flowRole.getEffective(); - }else if(flowRole.getCode().equals(EnumVerify.DocState.DortorCheck.getCode()+"")){ + } else if (flowRole.getCode().equals(EnumVerify.DocState.DortorCheck.getCode() + "")) { doctorCheckSumbitName = flowRole.getSumbitName(); dortorCheckEffective = flowRole.getEffective(); - }else if(flowRole.getCode().equals(EnumVerify.DocState.DirectorCheck.getCode()+"")){ + } else if (flowRole.getCode().equals(EnumVerify.DocState.DirectorCheck.getCode() + "")) { directorCheckSumbitName = flowRole.getSumbitName(); directorCheckEffective = flowRole.getEffective(); - }else if(flowRole.getCode().equals(EnumVerify.DocState.NurseSubmit.getCode()+"")){ + } else if (flowRole.getCode().equals(EnumVerify.DocState.NurseSubmit.getCode() + "")) { nurseSumbitName = flowRole.getSumbitName(); nurseSubmitEffective = flowRole.getEffective(); - }else if(flowRole.getCode().equals(EnumVerify.DocState.NurseCheck.getCode()+"")){ + } else if (flowRole.getCode().equals(EnumVerify.DocState.NurseCheck.getCode() + "")) { nurseCheckSumbitName = flowRole.getSumbitName(); nurseCheckEffective = flowRole.getEffective(); } @@ -653,13 +673,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { String masterId = '"' + id + '"'; //定义下个节点code int targetCode = 0; - if(!EnumVerify.DocState.HasCurrentState(status,EnumVerify.DocState.HeadNurseCheck)){ + if (!EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.HeadNurseCheck)) { //判断是否护士长审核 - boolean headNurseCheckFlag = getHeadNurseCheckFlag(status,roles); + boolean headNurseCheckFlag = getHeadNurseCheckFlag(status, roles); if (headNurseCheckFlag) { if (headNurseCheckPower == 1 && headNurseCheckEffective == 1) { targetCode = EnumVerify.DocState.HeadNurseCheck.getCode(); - btns += ""; + btns += ""; } } else { @@ -667,50 +687,51 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { if (!EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.DortorSubmit)) { if (doctorSumbitPower == 1 && doctorSubmitEffective == 1) { targetCode = EnumVerify.DocState.DortorSubmit.getCode(); - btns += ""; + btns += ""; } } //没有医生质控员提交 if (!EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.DortorCheck) && EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.DortorSubmit) || doctorSubmitEffective == 0) { if (doctorCheckSumbitPower == 1 && dortorCheckEffective == 1) { targetCode = EnumVerify.DocState.DortorCheck.getCode(); - btns += ""; + btns += ""; } } //没有科主任审核 if (!EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.DirectorCheck) && EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.DortorCheck) || (dortorCheckEffective == 0 && doctorSubmitEffective == 0) || (dortorCheckEffective == 0 && EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.DortorSubmit))) { if (directorCheckSumbitPower == 1 && directorCheckEffective == 1) { targetCode = EnumVerify.DocState.DirectorCheck.getCode(); - btns += ""; + btns += ""; } } //没有护士提交 if (!EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.NurseSubmit)) { if (nurseSumbitPower == 1 && nurseSubmitEffective == 1) { targetCode = EnumVerify.DocState.NurseSubmit.getCode(); - btns += ""; + btns += ""; } //没有护士质控员提交 } if (!EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.NurseCheck) && EnumVerify.DocState.HasCurrentState(status, EnumVerify.DocState.NurseSubmit) || nurseSubmitEffective == 0) { if (nurseCheckSumbitPower == 1 && nurseCheckEffective == 1) { targetCode = EnumVerify.DocState.NurseCheck.getCode(); - btns += ""; + btns += ""; } } } //退回按钮 - if(StringUtils.isNotBlank(btns) && backPower == 1){ - btns += ""; + if (StringUtils.isNotBlank(btns) && backPower == 1) { + btns += ""; } } } return btns; } + /** * 计算是否属于护士长审核 - * */ - private boolean getHeadNurseCheckFlag(int status,List roles){ + */ + private boolean getHeadNurseCheckFlag(int status, List roles) { boolean flag = true; List effectiveRoles = new ArrayList<>(); //遍历查询匹配医生和护士支线最后节点均已提交 @@ -724,14 +745,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { effectiveRoles.add(role); } } - if(!effectiveRoles.isEmpty()){ - for(ArchiveFlowRole role : effectiveRoles){ + if (!effectiveRoles.isEmpty()) { + for (ArchiveFlowRole role : effectiveRoles) { //获取节点code String code = role.getCode(); //转换类型 Integer integerCode = Integer.valueOf(code); //其中有一个不包含直接返回false - if((status & integerCode) == 0){ + if ((status & integerCode) == 0) { return false; } } @@ -751,7 +772,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } - @Override public int updateById(Archive_Master record) { return archiveMasterMapper.updateById(record); @@ -765,12 +785,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 插入第三方oracle库 + * * @param flowInfo */ - private void backInsertOracle(Integer code,ArchiveFlowInfo flowInfo){ + private void backInsertOracle(Integer code, ArchiveFlowInfo flowInfo) { //查询是否存在记录 String masterId = flowInfo.getMasterId(); - String selectSql = "SELECT count(1) FROM ARCHIVE_FLOW_INFO where master_id = '"+masterId+"'"; + String selectSql = "SELECT count(1) FROM ARCHIVE_FLOW_INFO where master_id = '" + masterId + "'"; List counts = null; try { counts = OracleConnect.selectList(selectSql); @@ -778,7 +799,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { e.printStackTrace(); throw new RuntimeException("审核时查询oracle记录失败"); } - if(code == 1 || !"0".equals(counts.get(0))) { + if (code == 1 || !"0".equals(counts.get(0))) { Archive_Master master = archiveMasterMapper.selectByPrimaryKey(masterId); String patientId = master.getPatientId(); String sql = "insert all into archive_flow_info (" + @@ -830,15 +851,16 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 退回，修改oracle信息 将该支线的所有可用都改为'否',并修改是否退回为''和退回时间 + * * @param roleIndex * @param archiveDetailId */ private void updateOracle(String roleIndex, String archiveDetailId) { //修改语句 - String sql = "update ARCHIVE_FLOW_INFO set is_available = '否' where master_id = '"+archiveDetailId+"'"; - if(StringUtils.isNotBlank(roleIndex)){ + String sql = "update ARCHIVE_FLOW_INFO set is_available = '否' where master_id = '" + archiveDetailId + "'"; + if (StringUtils.isNotBlank(roleIndex)) { //修改单条支线 - sql += " and OPER_ROLE in ("+roleIndex+",4)"; + sql += " and OPER_ROLE in (" + roleIndex + ",4)"; } try { OracleConnect.update(sql); @@ -850,17 +872,17 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 退回操作 - * */ + */ @Override - public int updateReturn(Emr_Fault_Detail_Vo emrFaultDetail) throws Exception{ + public int updateReturn(Emr_Fault_Detail_Vo emrFaultDetail) throws Exception { //修改病案归档状态：复审退回 Archive_Master archiveMaster = new Archive_Master(); // 从session获取用户名 String username = (String) SecurityUtils.getSubject().getSession().getAttribute("userSession");//获取前面登录的用户名 //设置回退给角色信息 String returntoRole = emrFaultDetail.getReturntoRole(); - log.info(username+"将病案:"+emrFaultDetail.getArchiveDetailId()+"退回给"+returntoRole); - if(StringUtils.isNotBlank(emrFaultDetail.getStatus())) { + log.info(username + "将病案:" + emrFaultDetail.getArchiveDetailId() + "退回给" + returntoRole); + if (StringUtils.isNotBlank(emrFaultDetail.getStatus())) { int status = Integer.valueOf(emrFaultDetail.getStatus()); //计算状态code //查询审核角色集合，根据有效进行计算状态code @@ -870,9 +892,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //定义下个节点code String targetCode = ""; //为空为病案室退回 - if(null == emrFaultDetail.getTargetCode()){ + if (null == emrFaultDetail.getTargetCode()) { targetCode = EnumVerify.DocState.MedicalRoomCheck.getCode() + ""; - }else{ + } else { targetCode = emrFaultDetail.getTargetCode() + ""; } //定义退回内容 @@ -890,14 +912,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //退回给医生 case "DOCTOR": //获取当前状态码 - status = EnumVerify.DocState.backToDoctor(Integer.valueOf(emrFaultDetail.getStatus()),archiveFlowRoles); + status = EnumVerify.DocState.backToDoctor(Integer.valueOf(emrFaultDetail.getStatus()), archiveFlowRoles); //退回的状态码 backToCodeList.add(EnumVerify.DocState.DortorBack.getCode()); roleIndex = "1"; break; //退回给护士 case "NURSE": - status = EnumVerify.DocState.backToNurse(Integer.valueOf(emrFaultDetail.getStatus()),archiveFlowRoles); + status = EnumVerify.DocState.backToNurse(Integer.valueOf(emrFaultDetail.getStatus()), archiveFlowRoles); backToCodeList.add(EnumVerify.DocState.NurseBack.getCode()); roleIndex = "2"; break; @@ -907,14 +929,15 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { backToCodeList.add(EnumVerify.DocState.DortorBack.getCode()); backToCodeList.add(EnumVerify.DocState.NurseBack.getCode()); break; - default:; + default: + ; } //循环添加进流转记录和缺陷记录 - for(Integer backToCode : backToCodeList){ + for (Integer backToCode : backToCodeList) { //获取当前节点和下个节点对象集合 - List currentRoleAndNextRole = flowInfoService.getCurrentRoleAndNextRole(targetCode, backToCode,archiveFlowRoles); + List currentRoleAndNextRole = flowInfoService.getCurrentRoleAndNextRole(targetCode, backToCode, archiveFlowRoles); //添加进流转记录 - ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(masterId,remark,currentRoleAndNextRole.get(0),currentRoleAndNextRole.get(1),new Date()); + ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(masterId, remark, currentRoleAndNextRole.get(0), currentRoleAndNextRole.get(1), new Date()); //插入退回信息 //backInsertOracle(0,flowInfo); //修改退回信息 @@ -986,9 +1009,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * author:zwh * 初审审核操作 - * */ + */ @Override - public Msg updateStateByArchivId(Archive_Master_Vo master) throws Exception{ + public Msg updateStateByArchivId(Archive_Master_Vo master) throws Exception { //修改病案归档状态 if (StringUtils.isNotBlank(master.getArchivestate())) { StringBuilder masterIds = new StringBuilder(); @@ -1005,14 +1028,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //获取资料完整标识集合 String[] isSuccesses = master.getIsSuccess().split(","); for (int i = 0; i < archivestates.length; i++) { - if(StringUtils.isNotBlank(archivestates[i])){ + if (StringUtils.isNotBlank(archivestates[i])) { //完整或只有一个 - if("1".equals(isSuccesses[i]) || ids.length == 1){ - updateApprove(ids[i],master.getRemark(), roleArr[i], archiveFlowRoles, archivestates[i], roleCodes[i]); - }else{ - if(StringUtils.isBlank(masterIds)){ + if ("1".equals(isSuccesses[i]) || ids.length == 1) { + updateApprove(ids[i], master.getRemark(), roleArr[i], archiveFlowRoles, archivestates[i], roleCodes[i]); + } else { + if (StringUtils.isBlank(masterIds)) { masterIds.append("'").append(ids[i]).append("'"); - }else{ + } else { masterIds.append(",'").append(ids[i]).append("'"); } } @@ -1020,13 +1043,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } //不完整,根据不完整主键集合组织不对应不完整分类集合 List unSuccessList = new ArrayList<>(); - if(StringUtils.isNotBlank(masterIds)){ + if (StringUtils.isNotBlank(masterIds)) { unSuccessList = selectUnSuccessAssortByMasterIds(masterIds); } - if(!CollectionUtils.isEmpty(unSuccessList)){ + if (!CollectionUtils.isEmpty(unSuccessList)) { //存在不完整 - return Msg.success().add("unSuccessList",unSuccessList); - }else{ + return Msg.success().add("unSuccessList", unSuccessList); + } else { //全部完整返回 return Msg.success(); } @@ -1037,12 +1060,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 插入第三方oracle库 + * * @param flowInfo */ - private void insertOracle(Integer code,ArchiveFlowInfo flowInfo){ + private void insertOracle(Integer code, ArchiveFlowInfo flowInfo) { //查询是否存在记录 String masterId = flowInfo.getMasterId(); - String selectSql = "SELECT count(1) FROM ARCHIVE_FLOW_INFO where master_id = '"+masterId+"'"; + String selectSql = "SELECT count(1) FROM ARCHIVE_FLOW_INFO where master_id = '" + masterId + "'"; List counts = null; try { counts = OracleConnect.selectList(selectSql); @@ -1050,8 +1074,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { e.printStackTrace(); throw new RuntimeException("审核时查询oracle记录失败"); } - log.info("masterId查询结果:"+counts.get(0)); - if(code == 1 || !"0".equals(counts.get(0))) { + log.info("masterId查询结果:" + counts.get(0)); + if (code == 1 || !"0".equals(counts.get(0))) { Archive_Master master = archiveMasterMapper.selectByPrimaryKey(masterId); String patientId = master.getPatientId(); String sql = "insert all into archive_flow_info (" + @@ -1088,7 +1112,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { + "'" + patientId + "'," + "'" + "是" + "'" + ") select * from dual"; - log.info("sql:"+sql); + log.info("sql:" + sql); try { OracleConnect.insert(sql); log.info("成功"); @@ -1103,6 +1127,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 当次初审 + * * @param remark * @param role * @param archiveFlowRoles @@ -1111,32 +1136,33 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { * @param roleCode * @throws Exception */ - private void updateApprove(String masterId,String remark, String role, List archiveFlowRoles, String archivestate, String roleCode) throws Exception { + private void updateApprove(String masterId, String remark, String role, List archiveFlowRoles, String archivestate, String roleCode) throws Exception { Archive_Master archiveMaster = new Archive_Master(); Integer code = Integer.valueOf(archivestate); //计算状态code // code:当前状态code，role:角色1医生2护士3护士长，archiveFlowRoles：根据有效的审核角色进行计算 - int statuCode = EnumVerify.DocState.GetNextStepCode(code,Integer.valueOf(role), archiveFlowRoles); - archiveMaster.setArchivestate(statuCode+""); + int statuCode = EnumVerify.DocState.GetNextStepCode(code, Integer.valueOf(role), archiveFlowRoles); + archiveMaster.setArchivestate(statuCode + ""); archiveMaster.setId(masterId); //更新 updateByClo(archiveMaster); //获取当前节点和下个节点对象集合 - List currentRoleAndNextRole = flowInfoService.getCurrentRoleAndNextRole(roleCode, null,archiveFlowRoles); + List currentRoleAndNextRole = flowInfoService.getCurrentRoleAndNextRole(roleCode, null, archiveFlowRoles); //添加进流转记录 - ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(masterId,remark,currentRoleAndNextRole.get(0),currentRoleAndNextRole.get(1),new Date()); + ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(masterId, remark, currentRoleAndNextRole.get(0), currentRoleAndNextRole.get(1), new Date()); //处于初始状态的添加进第三方oracle库里 //insertOracle(code,flowInfo); } /** * 根据不完整masterId集合返回对应不完整分类集合 + * * @param masterIds * @return */ private List selectUnSuccessAssortByMasterIds(StringBuilder masterIds) { List list = new ArrayList<>(); - if(StringUtils.isNotBlank(masterIds)){ + if (StringUtils.isNotBlank(masterIds)) { //按masterId分组查询需要已采集的分类集合 List details = detailMapper.selectAssortIdsByMasterIds(masterIds.toString()); //按masterId分组查询是否存在缺少检验检查报告单的masterId集合 @@ -1146,41 +1172,41 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { assort.setIsCheck(1); List assortList = assortMapper.selectAll(assort); String[] masterIdArr = masterIds.toString().split(","); - for (String masterId:masterIdArr) { + for (String masterId : masterIdArr) { masterId = masterId.replaceAll("\'", ""); Archive_Master_Vo master = new Archive_Master_Vo(); StringBuilder unSuccessAssortNames = new StringBuilder(); - for(Zd_Assort assortFor : assortList){ + for (Zd_Assort assortFor : assortList) { //定义无匹配的分类 boolean flag = false; - for(Archive_Detail detail : details){ + for (Archive_Detail detail : details) { //判断主键相同且分类id相同 - if(masterId.equals(detail.getMasterid()) && assortFor.getAssortId().equals(detail.getAssortid())){ + if (masterId.equals(detail.getMasterid()) && assortFor.getAssortId().equals(detail.getAssortid())) { flag = true; break; } } //该分类无匹配组织名称集合 - if(!flag){ - if(StringUtils.isBlank(unSuccessAssortNames)){ + if (!flag) { + if (StringUtils.isBlank(unSuccessAssortNames)) { unSuccessAssortNames.append(assortFor.getAssortName()); - }else{ + } else { unSuccessAssortNames.append(",").append(assortFor.getAssortName()); } } } //判断是否缺少检验检查报告单 - if(!CollectionUtils.isEmpty(inspectionList)){ + if (!CollectionUtils.isEmpty(inspectionList)) { //定义存在缺少检验检查报告 boolean inspectionFlag = true; - for(Archive_Detail detail:inspectionList){ - if(masterId.equals(detail.getMasterid())){ + for (Archive_Detail detail : inspectionList) { + if (masterId.equals(detail.getMasterid())) { inspectionFlag = false; break; } } - if(!inspectionFlag){ - if(StringUtils.isNotBlank(unSuccessAssortNames)){ + if (!inspectionFlag) { + if (StringUtils.isNotBlank(unSuccessAssortNames)) { unSuccessAssortNames.append(","); } unSuccessAssortNames.append("检验检查报告单"); @@ -1197,21 +1223,21 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * author:zwh * 终审审核操作 - * */ + */ @Override - public void updateFiled(Archive_Master_Vo master) throws Exception{ + public void updateFiled(Archive_Master_Vo master) throws Exception { // 从session获取用户名 - CommomVo commomVo=new CommomVo(); + CommomVo commomVo = new CommomVo(); String username = (String) SecurityUtils.getSubject().getSession().getAttribute("userSession");//获取前面登录的用户名 SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String[] idList = master.getId().split(","); String ids = String.join(",", idList); List archiveFlowRoles = flowRoleMapper.selectAll(); List archive_masterVos = archive_masterMapper.selectCommonlyUsedNew(ids); - if(CollectionUtils.isEmpty(archive_masterVos)){ + if (CollectionUtils.isEmpty(archive_masterVos)) { return; } - for (Archive_Master list:archive_masterVos){ + for (Archive_Master list : archive_masterVos) { commomVo.setPatientId(list.getId()); commomVo.setAdmissTimes(list.getVisitId()); commomVo.setInpatientNo(list.getInpNo()); @@ -1221,13 +1247,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { commomVo.setAdmissId(list.getId()); commomVo.setAge(list.getSubAssort()); DateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - Date date1=null; - Date date2=null; + Date date1 = null; + Date date2 = null; String dischargeDateTime = list.getDischargeDateTime(); String admissionDateTime = list.getAdmissionDateTime(); try { - date1=format.parse(dischargeDateTime); - date2=format.parse(admissionDateTime); + date1 = format.parse(dischargeDateTime); + date2 = format.parse(admissionDateTime); } catch (ParseException e) { e.printStackTrace(); } @@ -1235,8 +1261,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { Calendar ca2 = Calendar.getInstance(); ca1.setTime(date1); ca2.setTime(date2); - long distanceMin =( ca1.getTimeInMillis()- ca2.getTimeInMillis())/(1000*60*60*24); - int i2= (int)distanceMin; + long distanceMin = (ca1.getTimeInMillis() - ca2.getTimeInMillis()) / (1000 * 60 * 60 * 24); + int i2 = (int) distanceMin; commomVo.setAdmissDays(i2); commomVo.setAdmissDate(list.getAdmissionDateTime()); commomVo.setDisDate(list.getDischargeDateTime()); @@ -1244,8 +1270,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { commomVo.setAttending(list.getDoctorInCharge()); archive_masterMapper.insertCommonlyUsed(commomVo); } - for(String id : idList) { - if(StringUtils.isNotBlank(id)) { + for (String id : idList) { + if (StringUtils.isNotBlank(id)) { //修改病案归档状态 Archive_Master archiveMaster = new Archive_Master(); master.setId(id); @@ -1272,7 +1298,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //是已召回，将当前节点code置为病案室审核 String currentStatus = EnumVerify.DocState.MedicalRoomCheck.getCode() + ""; //获取当前节点和下个节点对象集合 - List currentRoleAndNextRole = flowInfoService.getCurrentRoleAndNextRole(currentStatus, EnumVerify.DocState.MedicalRoomCheck.getCode(),archiveFlowRoles); + List currentRoleAndNextRole = flowInfoService.getCurrentRoleAndNextRole(currentStatus, EnumVerify.DocState.MedicalRoomCheck.getCode(), archiveFlowRoles); //添加流转节点 ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(master.getId(), master.getRemark(), currentRoleAndNextRole.get(0), currentRoleAndNextRole.get(1), sumbitDate); //insertOracle(0,flowInfo); @@ -1285,15 +1311,15 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 获取当前角色属于审核哪种角色 * 医生支线返回1，护士支线返回2，一般审核者返回3 - * */ + */ @Override - public Msg getRole(){ + public Msg getRole() { Msg msg = new Msg(); //获取用户功能权限信息 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); Set menus = user.getMenus(); - if(null != menus && !menus.isEmpty()){ + if (null != menus && !menus.isEmpty()) { //定义医生支线role int doctorRole = 0; //定义护士支线role @@ -1315,45 +1341,45 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { StringBuilder powerCode = new StringBuilder(); //遍历，判断拥有权限，拥有护士长权限立即返回4，拥有医生支线赋值doctorRole=1,拥有护士支线赋值nurseRole=1 for (String menu : menus) { - if(StringUtils.isNotBlank(menu)){ - if(menu.equals(doctorSumbit)){ + if (StringUtils.isNotBlank(menu)) { + if (menu.equals(doctorSumbit)) { doctorRole = 1; powerCode.append(EnumVerify.DocState.DortorSubmit.getCode()).append(","); } - if(menu.equals(doctorCheckSumbit)){ + if (menu.equals(doctorCheckSumbit)) { doctorRole = 1; powerCode.append(EnumVerify.DocState.DortorCheck.getCode()).append(","); } - if(menu.equals(directorCheckSumbit)){ + if (menu.equals(directorCheckSumbit)) { doctorRole = 1; powerCode.append(EnumVerify.DocState.DirectorCheck.getCode()).append(","); } - if(menu.equals(nurseSumbit)){ + if (menu.equals(nurseSumbit)) { nurseRole = 1; powerCode.append(EnumVerify.DocState.NurseSubmit.getCode()).append(","); } - if(menu.equals(nurseCheckSumbit)){ + if (menu.equals(nurseCheckSumbit)) { nurseRole = 1; powerCode.append(EnumVerify.DocState.NurseCheck.getCode()).append(","); } - if(menu.equals(headNurseCheck)){ + if (menu.equals(headNurseCheck)) { genegrateRole = 1; powerCode.append(EnumVerify.DocState.HeadNurseCheck.getCode()).append(","); } } } - if(powerCode.toString().endsWith(",")){ + if (powerCode.toString().endsWith(",")) { powerCode = new StringBuilder(powerCode.substring(0, powerCode.length() - 1)); } msg.setMsg(powerCode.toString()); //判断属于哪个支线权限 - if(doctorRole == 1 && nurseRole == 0){ + if (doctorRole == 1 && nurseRole == 0) { msg.setCode(1); } - if(doctorRole == 0 && nurseRole == 1){ + if (doctorRole == 0 && nurseRole == 1) { msg.setCode(2); } - if(doctorRole == 1 && nurseRole == 1 || genegrateRole == 1){ + if (doctorRole == 1 && nurseRole == 1 || genegrateRole == 1) { msg.setCode(4); } return msg; @@ -1363,23 +1389,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { /** * 查oracle视图，带记账号查询纸质签收的记账号集合 + * * @param patientIdStr * @return */ @Override - public List selectOracleGetSignList(StringBuilder patientIdStr, List selectList){ + public List selectOracleGetSignList(StringBuilder patientIdStr, List selectList) { //查询签收情况 String sql = ""; - if(StringUtils.isNotBlank(patientIdStr)){ - sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" + - "and freg_date is not null"; - }else{ + if (StringUtils.isNotBlank(patientIdStr)) { + sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in (" + patientIdStr.toString() + ")" + + "and freg_date is not null"; + } else { sql = "select fpat_no from v_jswzh_archive_bqreg where freg_date is not null"; } //执行查询 - try{ + try { selectList = OracleConnect.selectList(sql); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); ExceptionPrintUtil.printException(e); } @@ -1394,10 +1421,10 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public String selectAssortIdsByMasterId(String masterId) { //按masterId分组查询需要已采集的分类集合 List details = detailMapper.selectAssortIdsByMasterId(masterId.toString()); - String assortIdStr =""; + String assortIdStr = ""; for (Archive_Detail detail : details) { - if(StringUtils.isNotBlank(detail.getAssortid())){ - assortIdStr+=detail.getAssortid()+","; + if (StringUtils.isNotBlank(detail.getAssortid())) { + assortIdStr += detail.getAssortid() + ","; } } return assortIdStr; diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 0fd8234..dd3a05a 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -54,11 +54,13 @@ allAddortIds = 00000000 overDateSet = 2021-05-01 #\u5404\u5BA1\u6838\u89D2\u8272\u7528\u6237id 1\uFF1A\u533B\u751F\uFF1B2\uFF1A\u62A4\u58EB\uFF1B3\uFF1A\u75C5\u6848\u5BA4\u4EBA\u5458\uFF1B5\uFF1A\u533B\u751F\u8D28\u63A7\u5458\uFF1B6\uFF1A\u79D1\u4E3B\u4EFB\uFF1B7\uFF1A\u62A4\u58EB\u957F\uFF1B8\uFF1A\u62A4\u58EB\u8D28\u63A7\u5458 -#电子病历采集器标识 -doctorFlag= 2,15,8 +#电子病历采集器标识,2023-12-18医院护理记录接口没上，先改为提交电子病历同时默认提交护理记录 +doctorFlag= 2,15,8,1 #护理记录采集器标识 nurseFlag= 1 #补偿采集器标识 collectIdList= 1,2,15,8 #定时需要补偿的采集器id scheduledFlag=1,2,15,8 +#定时补偿任务时间 +quartzTime=0 38 14 ? * * diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 66d327b..abe27f3 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -731,7 +731,7 @@ SELECT diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 0bd9f57..31fbe91 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -650,6 +650,65 @@ + + + +<%--退回医生确认框--%> + + + + +<%--退回护士确认框--%> + + + + <%--审核确认弹窗--%>