diff --git a/doc/yd_record.bak b/doc/yd_record.bak index 82f9b30..4141d51 100644 Binary files a/doc/yd_record.bak and b/doc/yd_record.bak differ diff --git a/src/main/java/com/emr/controller/LoginController.java b/src/main/java/com/emr/controller/LoginController.java index 5c5363b..badf137 100644 --- a/src/main/java/com/emr/controller/LoginController.java +++ b/src/main/java/com/emr/controller/LoginController.java @@ -30,6 +30,12 @@ public class LoginController { @Value("${powerUrl}") private String powerUrl; + @Value("${medicalRecordsRoomDeptId}") + private String medicalRecordsRoomDeptId; + + @Value("${medicalepartmentDeptId}") + private String medicalepartmentDeptId; + @RequestMapping(value = "/toLogin") public String toLogin(Model model) { // 从session获取用户名 @@ -74,14 +80,14 @@ public class LoginController { }catch (Exception e){ e.printStackTrace(); } + model.addAttribute("isAllDeptIds",medicalRecordsRoomDeptId + "," + medicalepartmentDeptId); return "index"; } @RequestMapping(value = "/index") - public String Login(HttpServletRequest request, Model model) { + public String Login() { return "index"; } - } diff --git a/src/main/java/com/emr/controller/MedicalRecallController.java b/src/main/java/com/emr/controller/MedicalRecallController.java index c05aea1..7a4231f 100644 --- a/src/main/java/com/emr/controller/MedicalRecallController.java +++ b/src/main/java/com/emr/controller/MedicalRecallController.java @@ -55,7 +55,7 @@ public class MedicalRecallController { @ResponseBody @RequestMapping(value = "/recallList") - public OffsetLimitPage recallList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { + public OffsetLimitPage recallList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { OffsetLimitPage result = emrFaultDetailService.selectByCol(emrFaultVo, offset, limit); return result; } @@ -98,7 +98,6 @@ public class MedicalRecallController { exportExcelUtil.expordExcel(tableThNames, fieldCns, list, fileName, response); } - @OptionalLog(methods = "病案召回") @ResponseBody @RequestMapping(value = "/updateState") public int updateState(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) { diff --git a/src/main/java/com/emr/controller/PaperPositionController.java b/src/main/java/com/emr/controller/PaperPositionController.java new file mode 100644 index 0000000..5cff7f7 --- /dev/null +++ b/src/main/java/com/emr/controller/PaperPositionController.java @@ -0,0 +1,21 @@ +package com.emr.controller; + +import com.emr.service.ipml.EmrPaperPositionInfoServer; +import com.emr.util.Msg; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +@Controller +@RequestMapping("paperPosition") +public class PaperPositionController { + @Autowired + private EmrPaperPositionInfoServer paperPositionInfoServer; + @RequestMapping("savePaperPosition") + @ResponseBody + public Msg savePaperPosition(String masterId,String paperPosition) throws Exception{ + paperPositionInfoServer.savePaperPositionInfo(masterId,paperPosition); + return Msg.success(); + } +} diff --git a/src/main/java/com/emr/controller/PatientListController.java b/src/main/java/com/emr/controller/PatientListController.java new file mode 100644 index 0000000..c935a67 --- /dev/null +++ b/src/main/java/com/emr/controller/PatientListController.java @@ -0,0 +1,32 @@ +package com.emr.controller; + +import com.emr.entity.Archive_Master_Vo; +import com.emr.entity.OffsetLimitPage; +import com.emr.service.ipml.PatientListService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +@Controller +@RequestMapping("patientList") +public class PatientListController { + @Autowired + private PatientListService patientListService; + @RequestMapping("select") + public String select(){ + return "statistics/patientList"; + } + + @ResponseBody + @RequestMapping(value = "getPatientList") + public OffsetLimitPage getPatientList( Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch) { + //判断是否是初始化查询,是初始化查询把开始结束时间置空 + if(isSearch == 0){ + archiveMasterVo.setStartDateTo(null); + archiveMasterVo.setEndDateTo(null); + } + OffsetLimitPage result = patientListService.getPatientList(archiveMasterVo, offset, limit); + return result; + } +} diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 19bc561..bf3f990 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -63,12 +63,12 @@ public class beHospitaledController { @Autowired private Archive_DetailMapper detailMapper; @RequestMapping(value = "/beHosps") - public String inHospitals(Model model){ + public String inHospitals(){ return "beHospitaledDir/beHospList"; } @ResponseBody @RequestMapping(value = "/beHospList") - public OffsetLimitPage beHospList(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch) { + public OffsetLimitPage beHospList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch) { //判断是否是初始化查询,是初始化查询把开始结束时间置空 if(isSearch == 0){ archiveMasterVo.setStartDateTo(null); @@ -102,16 +102,16 @@ public class beHospitaledController { @ResponseBody @RequestMapping(value = "/updateStateByArchivId") - public String updateStateByArchivId(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) { - + public String updateStateByArchivId(Emr_Fault_Detail emrFaultDetail) { String result = ""; - result = checkSuccessMethod(emrFaultDetail.getArchiveDetailId()); + //result = checkSuccessMethod(emrFaultDetail.getArchiveDetailId()); // 从session获取用户名 Subject currentUser = SecurityUtils.getSubject(); Session session = currentUser.getSession(); String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowTime = format1.format(new Date()); if(result.equals("完整")) { //修改病案归档状态 Archive_Master archiveMaster = new Archive_Master(); @@ -123,11 +123,8 @@ public class beHospitaledController { archiveMaster.setCheckDoctor(username); archiveMaster.setLockinfo(result); int bol = archiveMasterService.updateByClo(archiveMaster); - //添加初审内容 if (bol == 1) { - String nowTime = format1.format(new Date()); - //参数输入 emrFaultDetail.setCreater(username); emrFaultDetail.setCreateTime(nowTime); @@ -139,7 +136,7 @@ public class beHospitaledController { Archive_Master archiveMaster = new Archive_Master(); archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); //设置审核时间 - archiveMaster.setCheckDatetime(format1.format(new Date())); + archiveMaster.setCheckDatetime(nowTime); //设置审核人 archiveMaster.setCheckDoctor(username); archiveMaster.setLockinfo(result); diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index ca7c69e..ea87974 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -10,6 +10,7 @@ import com.emr.entity.*; import com.emr.service.Archive_MasterService; import com.emr.service.Emr_Fault_DetailService; import com.emr.service.Emr_Fault_TypeService; +import com.emr.service.ipml.EmrPaperPositionInfoServer; import com.emr.util.ExportExcelUtil; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.endpoint.Client; @@ -57,6 +58,8 @@ public class lastVerifyController { @Autowired private Emr_Fault_DetailService emrFaultDetailService; + @Autowired + private EmrPaperPositionInfoServer paperPositionInfoServer; @RequestMapping(value = "/lastVerifys") public String faults(Model model) { return "lastVerifyDir/lastVerifyList"; @@ -64,7 +67,7 @@ public class lastVerifyController { @ResponseBody @RequestMapping(value = "/lastVerifyList") - public OffsetLimitPage lastVerifyList(HttpServletRequest request, HttpServletResponse response, Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch) { + public OffsetLimitPage lastVerifyList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch) { //判断是否是初始化查询,是初始化查询把开始结束时间置空 if(isSearch == 0){ archiveMasterVo.setStartDateTo(null); @@ -114,7 +117,7 @@ public class lastVerifyController { @ResponseBody @RequestMapping(value = "/updateDetailByArchivId") - public int updateDetailByArchivId(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail_Vo emrFaultDetail) { + public int updateDetailByArchivId(Emr_Fault_Detail_Vo emrFaultDetail) { //修改病案归档状态:复审退回 Archive_Master archiveMaster = new Archive_Master(); archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); @@ -228,23 +231,23 @@ public class lastVerifyController { //终审 @ResponseBody @RequestMapping(value = "/updateStateByArchivId") - public int updateStateByArchivId(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail_Vo emrFaultDetail) { + public int updateStateByArchivId(Emr_Fault_Detail_Vo emrFaultDetail,String paperPosition) { // 从session获取用户名 Subject currentUser = SecurityUtils.getSubject(); Session session = currentUser.getSession(); String username = (String) session.getAttribute("userSession");//获取前面登录的用户名 SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowTime = format1.format(new Date()); //修改病案归档状态 Archive_Master archiveMaster = new Archive_Master(); archiveMaster.setId(emrFaultDetail.getArchiveDetailId()); archiveMaster.setArchivestate("已归档"); //设置审核时间 - if(StringUtils.isBlank(emrFaultDetail.getCheckedDateTime())){ - archiveMaster.setCheckedDatetime(format1.format(new Date())); - }else{ - archiveMaster.setCheckedDatetime(emrFaultDetail.getCheckedDateTime()); + if(StringUtils.isNotBlank(emrFaultDetail.getCheckedDateTime())){ + nowTime = emrFaultDetail.getCheckedDateTime(); } + archiveMaster.setCheckedDatetime(nowTime); //设置修改原因 archiveMaster.setChangeReason(emrFaultDetail.getChangeReason()); //设置审核人 @@ -252,14 +255,16 @@ public class lastVerifyController { int bol = archiveMasterService.updateByClo(archiveMaster); //添加初审内容 if (bol == 1) { - String nowTime = format1.format(new Date()); - //参数输入 emrFaultDetail.setCreater(username); emrFaultDetail.setCreateTime(nowTime); emrFaultDetail.setState("未召回"); emrFaultDetailService.insertSel(emrFaultDetail); } + //设置物理位置信息 + if(StringUtils.isNotBlank(paperPosition)){ + paperPositionInfoServer.savePaperPositionInfo(emrFaultDetail.getArchiveDetailId(),paperPosition); + } return 1; } diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index 0dfe0da..52de649 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -31,4 +31,5 @@ public interface Archive_MasterMapper { List getDoctorFileInfo(@Param("deptCode")String deptCode,@Param("doctor")String doctor,@Param("startTime")String startTime,@Param("endTime")String endTime); + List selectAllPatient(Archive_Master_Vo archiveMasterVo); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/EmrPaperPositionInfoMapper.java b/src/main/java/com/emr/dao/EmrPaperPositionInfoMapper.java new file mode 100644 index 0000000..ebf94ff --- /dev/null +++ b/src/main/java/com/emr/dao/EmrPaperPositionInfoMapper.java @@ -0,0 +1,20 @@ +package com.emr.dao; + +import com.emr.entity.EmrPaperPositionInfo; +import org.apache.ibatis.annotations.Param; + +public interface EmrPaperPositionInfoMapper { + int deleteByPrimaryKey(Integer id); + + int insert(EmrPaperPositionInfo record); + + int insertSelective(EmrPaperPositionInfo record); + + EmrPaperPositionInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(EmrPaperPositionInfo record); + + int updateByPrimaryKey(EmrPaperPositionInfo record); + + EmrPaperPositionInfo selectByMasterId(@Param("masterId")String masterId); +} \ No newline at end of file diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 39af88d..44f5acb 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -71,6 +71,56 @@ public class Archive_Master_Vo { private String checkedName; + private String paperStatus;//纸质签收状态 + + private String callBackStatus;//his召回状态 + + private String updateStatus;//修改状态 + + private String lockStatus;//封存状态 + + private String finalApproveContent;//终审内容 + + public String getFinalApproveContent() { + return finalApproveContent; + } + + public void setFinalApproveContent(String finalApproveContent) { + this.finalApproveContent = finalApproveContent; + } + + public String getLockStatus() { + return lockStatus; + } + + public void setLockStatus(String lockStatus) { + this.lockStatus = lockStatus; + } + + public String getUpdateStatus() { + return updateStatus; + } + + public void setUpdateStatus(String updateStatus) { + this.updateStatus = updateStatus; + } + + public String getPaperStatus() { + return paperStatus; + } + + public void setPaperStatus(String paperStatus) { + this.paperStatus = paperStatus; + } + + public String getCallBackStatus() { + return callBackStatus; + } + + public void setCallBackStatus(String callBackStatus) { + this.callBackStatus = callBackStatus; + } + public String getCheckName() { return checkName; } diff --git a/src/main/java/com/emr/entity/EmrPaperPositionInfo.java b/src/main/java/com/emr/entity/EmrPaperPositionInfo.java new file mode 100644 index 0000000..18b66cc --- /dev/null +++ b/src/main/java/com/emr/entity/EmrPaperPositionInfo.java @@ -0,0 +1,161 @@ +package com.emr.entity; + +import java.io.Serializable; +import java.util.Date; + +public class EmrPaperPositionInfo implements Serializable { + private Integer id; + + private String masterId; + + private String paperPosition; + + private String createTime; + + private String createUserName; + + private String updateTime; + + private String updateUserName; + + private String str1; + + private Integer int1; + + private String str2; + + private Integer int2; + + private Date time1; + + private Date time2; + + private static final long serialVersionUID = 1L; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getMasterId() { + return masterId; + } + + public void setMasterId(String masterId) { + this.masterId = masterId == null ? null : masterId.trim(); + } + + public String getPaperPosition() { + return paperPosition; + } + + public void setPaperPosition(String paperPosition) { + this.paperPosition = paperPosition == null ? null : paperPosition.trim(); + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime == null ? null : createTime.trim(); + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName == null ? null : createUserName.trim(); + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime == null ? null : updateTime.trim(); + } + + public String getUpdateUserName() { + return updateUserName; + } + + public void setUpdateUserName(String updateUserName) { + this.updateUserName = updateUserName == null ? null : updateUserName.trim(); + } + + public String getStr1() { + return str1; + } + + public void setStr1(String str1) { + this.str1 = str1 == null ? null : str1.trim(); + } + + public Integer getInt1() { + return int1; + } + + public void setInt1(Integer int1) { + this.int1 = int1; + } + + public String getStr2() { + return str2; + } + + public void setStr2(String str2) { + this.str2 = str2 == null ? null : str2.trim(); + } + + public Integer getInt2() { + return int2; + } + + public void setInt2(Integer int2) { + this.int2 = int2; + } + + public Date getTime1() { + return time1; + } + + public void setTime1(Date time1) { + this.time1 = time1; + } + + public Date getTime2() { + return time2; + } + + public void setTime2(Date time2) { + this.time2 = time2; + } + + @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(", masterId=").append(masterId); + sb.append(", paperPosition=").append(paperPosition); + sb.append(", createTime=").append(createTime); + sb.append(", createUserName=").append(createUserName); + sb.append(", updateTime=").append(updateTime); + sb.append(", updateUserName=").append(updateUserName); + sb.append(", str1=").append(str1); + sb.append(", int1=").append(int1); + sb.append(", str2=").append(str2); + sb.append(", int2=").append(int2); + sb.append(", time1=").append(time1); + sb.append(", time2=").append(time2); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/entity/Emr_Fault_Vo.java b/src/main/java/com/emr/entity/Emr_Fault_Vo.java index abbe76e..1116d86 100644 --- a/src/main/java/com/emr/entity/Emr_Fault_Vo.java +++ b/src/main/java/com/emr/entity/Emr_Fault_Vo.java @@ -70,6 +70,16 @@ public class Emr_Fault_Vo { private String patientId; + private String paperPosition; + + public String getPaperPosition() { + return paperPosition; + } + + public void setPaperPosition(String paperPosition) { + this.paperPosition = paperPosition; + } + public String getPatientId() { return patientId; } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 6109789..b983472 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -97,6 +97,6 @@ public interface Archive_MasterService { * @return */ Archive_Master selectByPrimaryKey(String id); -} - + void setPaperStatusAndCallbackStatus(List list); +} \ No newline at end of file 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 5978b39..ea5b3d4 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -6,7 +6,6 @@ */ package com.emr.service.ipml; -import com.emr.dao.Archive_DetailMapper; import com.emr.dao.Archive_MasterMapper; import com.emr.entity.Archive_Master; import com.emr.entity.Archive_Master_Vo; @@ -14,12 +13,15 @@ import com.emr.entity.Emr_Dictionary; import com.emr.entity.OffsetLimitPage; import com.emr.service.Archive_MasterService; import com.emr.service.Emr_DictionaryService; +import com.emr.util.ExceptionPrintUtil; +import com.emr.util.OracleConnect; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; -import java.util.ArrayList; import java.util.List; @Service @@ -63,15 +65,40 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage selectByColumn(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectByColumn(archiveMasterVo); - + //设置科室 + setDeptNameForList(list); return new OffsetLimitPage((Page) list); } + //设置科室 + private void setDeptNameForList(List list) { + if(!CollectionUtils.isEmpty(list)) { + //查询科室集合 + Emr_Dictionary dictionary = new Emr_Dictionary(); + dictionary.setTypecode("dept_code"); + List deptList = emrDictionaryService.dicByTypeCode(dictionary); + for (Archive_Master_Vo master : list) { + //设置科室 + if (!CollectionUtils.isEmpty(deptList)) { + for (Emr_Dictionary dictionary1 : deptList) { + //出院科室 + if (master.getDeptName().equals(dictionary1.getCode())) { + master.setDeptName(dictionary1.getName()); + } + //入院科室 + if (master.getDeptAdmissionTo().equals(dictionary1.getCode())) { + master.setDeptAdmissionTo(dictionary1.getName()); + } + } + } + } + } + } + @Override public OffsetLimitPage selectByUnfile(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectByUnfile(archiveMasterVo); - return new OffsetLimitPage((Page) list); } @@ -79,10 +106,89 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { public OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectByLast(archiveMasterVo); - + //设置科室设置纸质签收状态和his召回状态 + setPaperStatusAndCallbackStatus(list); return new OffsetLimitPage((Page) list); } + /** + * 终审设置纸质签收状态和his召回状态 + * @param list + */ + @Override + public void setPaperStatusAndCallbackStatus(List list) { + if(!CollectionUtils.isEmpty(list)){ + StringBuilder patientIdsBuilder = new StringBuilder(); + for(Archive_Master_Vo master : list){ + if(StringUtils.isNotBlank(patientIdsBuilder)){ + patientIdsBuilder.append(","); + } + patientIdsBuilder.append("'").append(master.getPatientId()).append("'"); + } + //查询纸质签收状态 + String paperStatusSql = "select fpatno from pacs.v_emrconfirm where fcomf_dt is not null and fpatno in ("+patientIdsBuilder.toString()+")"; + //查询his召回状态 + String callBackStatusSql = "select fpatno from pacs.v_emrreturn_apply where fpatno in ("+patientIdsBuilder.toString()+")"; + List paperPatiendIds = null; + List callBackPatiendIds = null; + /*try { + //查询纸质签收状态 + paperPatiendIds = OracleConnect.select2(paperStatusSql); + //查询his召回状态 + callBackPatiendIds = OracleConnect.select2(callBackStatusSql); + }catch (Exception e){ + e.printStackTrace(); + ExceptionPrintUtil.printException(e); + }*/ + //查询科室集合 + Emr_Dictionary dictionary = new Emr_Dictionary(); + dictionary.setTypecode("dept_code"); + List deptList = emrDictionaryService.dicByTypeCode(dictionary); + for(Archive_Master_Vo master : list){ + //设置科室 + if(!CollectionUtils.isEmpty(deptList)){ + for(Emr_Dictionary dictionary1 : deptList){ + //出院科室 + if(master.getDeptName().equals(dictionary1.getCode())){ + master.setDeptName(dictionary1.getName()); + } + //入院科室 + if(master.getDeptAdmissionTo().equals(dictionary1.getCode())){ + master.setDeptAdmissionTo(dictionary1.getName()); + } + } + } + String patientId = master.getPatientId(); + master.setPaperStatus("未签收"); + master.setCallBackStatus("未召回"); + //设置纸质签收状态 + if(!CollectionUtils.isEmpty(paperPatiendIds)){ + for(String paperPatientId : paperPatiendIds){ + if(paperPatientId.equals(patientId)){ + master.setPaperStatus("已签收"); + break; + } + } + } + //设置召回状态 + if(!CollectionUtils.isEmpty(callBackPatiendIds)){ + for(String callBackPatientId : callBackPatiendIds){ + if(callBackPatientId.equals(patientId)){ + master.setPaperStatus("已召回"); + break; + } + } + } + //设置修改状态 + if(StringUtils.isNotBlank(master.getUpdateStatus())){ + master.setUpdateStatus("已修改"); + }else{ + master.setUpdateStatus("未修改"); + } + } + } + } + @Override public int updateByClo(Archive_Master record) { return archiveMasterMapper.updateByClo(record); diff --git a/src/main/java/com/emr/service/ipml/EmrPaperPositionInfoServer.java b/src/main/java/com/emr/service/ipml/EmrPaperPositionInfoServer.java new file mode 100644 index 0000000..66f341f --- /dev/null +++ b/src/main/java/com/emr/service/ipml/EmrPaperPositionInfoServer.java @@ -0,0 +1,43 @@ +package com.emr.service.ipml; + +import com.emr.dao.EmrPaperPositionInfoMapper; +import com.emr.entity.EmrPaperPositionInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.text.SimpleDateFormat; +import java.util.Date; + +@Service +@Transactional +public class EmrPaperPositionInfoServer { + @Autowired + private EmrPaperPositionInfoMapper paperPositionInfoMapper; + @Autowired + private StatisticsService statisticsService; + public void savePaperPositionInfo(String masterId,String paperPosition){ + //查询masterId在该表中是否存在 + EmrPaperPositionInfo emrPaperPositionInfo = paperPositionInfoMapper.selectByMasterId(masterId); + if(null == emrPaperPositionInfo){ + emrPaperPositionInfo = new EmrPaperPositionInfo(); + } + String currentUserName = statisticsService.getCurrentUserName(); + emrPaperPositionInfo.setUpdateUserName(currentUserName); + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String nowTime = fmt.format(new Date()); + emrPaperPositionInfo.setUpdateTime(nowTime); + if(emrPaperPositionInfo.getId() == null){ + //不存在新建 + emrPaperPositionInfo.setCreateUserName(currentUserName); + emrPaperPositionInfo.setCreateTime(nowTime); + emrPaperPositionInfo.setPaperPosition(paperPosition); + emrPaperPositionInfo.setMasterId(masterId); + paperPositionInfoMapper.insertSelective(emrPaperPositionInfo); + }else{ + //存在则修改 + emrPaperPositionInfo.setPaperPosition(paperPosition); + paperPositionInfoMapper.updateByPrimaryKey(emrPaperPositionInfo); + } + } +} diff --git a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java index e202012..c6b8318 100644 --- a/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_Fault_DetailServiceImpl.java @@ -37,7 +37,6 @@ public class Emr_Fault_DetailServiceImpl implements Emr_Fault_DetailService { */ @Override public OffsetLimitPage selectByCol(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { - //return emrFaultDetailMapper.selectByCol(emrFaultDetail); PageHelper.offsetPage(offset, limit); List list = emrFaultDetailMapper.selectByCol(emrFaultVo); Emr_Dictionary dic = new Emr_Dictionary(); diff --git a/src/main/java/com/emr/service/ipml/PatientListService.java b/src/main/java/com/emr/service/ipml/PatientListService.java new file mode 100644 index 0000000..af97ad5 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/PatientListService.java @@ -0,0 +1,28 @@ +package com.emr.service.ipml; + +import com.emr.dao.Archive_MasterMapper; +import com.emr.entity.Archive_Master_Vo; +import com.emr.entity.OffsetLimitPage; +import com.emr.service.Archive_MasterService; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional +public class PatientListService { + @Autowired + private Archive_MasterMapper archiveMasterMapper; + @Autowired + private Archive_MasterService archiveMasterService; + public OffsetLimitPage getPatientList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = archiveMasterMapper.selectAllPatient(archiveMasterVo); + archiveMasterService.setPaperStatusAndCallbackStatus(list); + return new OffsetLimitPage((Page) list); + } +} diff --git a/src/main/java/com/emr/service/ipml/StatisticsService.java b/src/main/java/com/emr/service/ipml/StatisticsService.java index 7b814f2..7e0084e 100644 --- a/src/main/java/com/emr/service/ipml/StatisticsService.java +++ b/src/main/java/com/emr/service/ipml/StatisticsService.java @@ -4,9 +4,8 @@ import com.alibaba.fastjson.JSON; import com.emr.dao.StatisticsMapper; import com.emr.dao.TUuInfoMapper; import com.emr.dao.TUuPrintMapper; -import com.emr.entity.Archive_Master_Vo; -import com.emr.entity.OffsetLimitPage; -import com.emr.entity.TUuPrint; +import com.emr.entity.*; +import com.emr.service.Emr_DictionaryService; import com.emr.vo.*; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -20,6 +19,9 @@ 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; +import org.springframework.util.CollectionUtils; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; import java.text.SimpleDateFormat; @@ -50,6 +52,8 @@ public class StatisticsService { private TUuPrintMapper uuPrintMapper; @Autowired private TUuInfoMapper uuInfoMapper; + @Autowired + private Emr_DictionaryService emrDictionaryService; //终审按天统计 public List getFinalStatistics(HttpServletRequest request,Integer offset, Integer limit, String startDate, String endDate,String sql) { if(null != offset && null != limit){ @@ -115,7 +119,24 @@ public class StatisticsService { archiveMasterVo.setCheckDoctor(checkNames.toString()); } List list = statisticsMapper.statistics(disStartDate,disEndDate,archiveMasterVo,flag,sql); + //查询科室集合 + Emr_Dictionary dictionary = new Emr_Dictionary(); + dictionary.setTypecode("dept_code"); + List deptList = emrDictionaryService.dicByTypeCode(dictionary); for(Archive_Master_Vo statistics:list) { + //设置科室 + if(!CollectionUtils.isEmpty(deptList)){ + for(Emr_Dictionary dictionary1 : deptList){ + //出院科室 + if(statistics.getDeptName().equals(dictionary1.getCode())){ + statistics.setDeptName(dictionary1.getName()); + } + //入院科室 + if(statistics.getDeptAdmissionTo().equals(dictionary1.getCode())){ + statistics.setDeptAdmissionTo(dictionary1.getName()); + } + } + } for (User user : userList) { if(StringUtils.isNotBlank(statistics.getCheckDoctor()) && statistics.getCheckDoctor().equals(user.getUserName())){ statistics.setCheckName(user.getName()); @@ -189,5 +210,19 @@ public class StatisticsService { } return userList; } + + public HttpServletRequest getRequest(){ + return ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + } + + //获取当前用户 + public Power_User getCurrentUser(){ + return (Power_User)getRequest().getSession().getAttribute("CURRENT_USER"); + } + + //获取当前用户名 + public String getCurrentUserName(){ + return getCurrentUser().getUserName(); + } } diff --git a/src/main/java/com/emr/util/OracleConnect.java b/src/main/java/com/emr/util/OracleConnect.java index 893d84c..e560fec 100644 --- a/src/main/java/com/emr/util/OracleConnect.java +++ b/src/main/java/com/emr/util/OracleConnect.java @@ -122,6 +122,19 @@ public class OracleConnect { OracleConnect.CloseConn(rs, pst, conn); return list; } + public static List select2(String arg0) throws Exception { + Connection conn = new OracleConnect().getConnect(); + pst = conn.prepareStatement(arg0); + rs = pst.executeQuery(); + List list = new ArrayList<>(); + if(rs.next()) { + while (rs.next()) { + list.add(rs.getString(1)); + } + } + OracleConnect.CloseConn(rs, pst, conn); + return list; + } public static int insert(String sql) throws Exception { Connection conn = new OracleConnect().getConnect(); diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 6a5f1d7..7370919 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -1,9 +1,15 @@ -##退回病案给金蝶公司的webService接口地址 +##\u9000\u56DE\u75C5\u6848\u7ED9\u91D1\u8776\u516C\u53F8\u7684webService\u63A5\u53E3\u5730\u5740 RETURNWEBSERVICE = http://192.168.10.39:8001/KingdeeEmrArchiveReturn.asmx?wsdl -##webService qName参数1 +##webService qName\u53C2\u65701 RETURNPARM1 = http://tempuri.org/ -##webService qName参数2 +##webService qName\u53C2\u65702 RETURNPARM2 = SetArchieveReturn -#pdf水印 -pdfWater = 广东省英德市人民医院 \ No newline at end of file +#pdf\u6C34\u5370 +pdfWater = \u5E7F\u4E1C\u7701\u82F1\u5FB7\u5E02\u4EBA\u6C11\u533B\u9662 + +#\u75C5\u6848\u5BA4\u79D1\u5BA4\u7F16\u53F7 +medicalRecordsRoomDeptId = 1315 + +#\u533B\u52A1\u79D1\u79D1\u5BA4\u7F16\u53F7 +medicalepartmentDeptId = 1145 \ No newline at end of file diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index c50af0a..6665f5b 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,14 +1,14 @@ -#数据库IP +#\u6570\u636E\u5E93IP dataBaseIp=localhost -#数据库名称 -#dataBaseName=yd_record -##数据库密码 -#dataBasePassword=docus702 +#\u6570\u636E\u5E93\u540D\u79F0 +dataBaseName=yd_record +#\u6570\u636E\u5E93\u5BC6\u7801 +dataBasePassword=docus702 -##数据库名称 -dataBaseName=emr_record -#数据库密码 -dataBasePassword=xjgs+docus911 +##\u6570\u636E\u5E93\u540D\u79F0 +#dataBaseName=emr_record +##\u6570\u636E\u5E93\u5BC6\u7801 +#dataBasePassword=xjgs+docus911 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName} @@ -31,13 +31,13 @@ removeAbandoned: true removeAbandonedTimeout: 1800 logAbandoned: true -#图片地址 +#\u56FE\u7247\u5730\u5740 pictureUrl=src\\main\\webapp -powerUrl=http://10.36.116.108:8080/power/font/getMenusByUserIdAndSysFlag -POWER_URLHEAD=http://10.36.116.108:8080/power -POWER_JSP=http://10.36.116.108:8080/power -recallReason=医院需要这份文档 +powerUrl=http://localhost:8080/power/font/getMenusByUserIdAndSysFlag +POWER_URLHEAD=http://localhost:8080/power +POWER_JSP=http://localhost:8080/power +recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 HomepageDictionary=http://10.36.116.108:8080/filing/services/HomepageDictionary?wsdl HomepageMethod=CheckData diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index e666cad..19ae1de 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -187,8 +187,8 @@ - select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex,f.name - dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,d.name dept_admission_to + select m.id,m.patient_id,m.inp_no,m.visit_id,m.name,m.sex, + m.dept_name,m.discharge_date_time,m.ArchiveState,m.admission_date_time,m.dept_admission_to ,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend, datediff(day,m.discharge_date_time,getdate()) - (select COUNT(1) from emr_holiday_set where date between convert(varchar(10),m.discharge_date_time,120) @@ -199,12 +199,6 @@ days END from emr_overtime_set where id = 1) days from archive_master m - LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where - typeCode='dept_code' )) d - on m.dept_admission_to=d.code - LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where - typeCode='dept_code' )) f - on m.dept_name=f.code where 1=1 and ArchiveState in('归档中','复审退回','初审') and m.id = #{id,jdbcType=NVARCHAR} @@ -280,8 +274,8 @@ + + \ No newline at end of file diff --git a/src/main/resources/mapper/EmrPaperPositionInfoMapper.xml b/src/main/resources/mapper/EmrPaperPositionInfoMapper.xml new file mode 100644 index 0000000..71517eb --- /dev/null +++ b/src/main/resources/mapper/EmrPaperPositionInfoMapper.xml @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + id, master_id, paper_position, create_time, create_user_name, update_time, update_user_name, + str1, int1, str2, int2, time1, time2 + + + + delete from emr_paper_position_info + where id = #{id,jdbcType=INTEGER} + + + insert into emr_paper_position_info (id, master_id, paper_position, + create_time, create_user_name, update_time, + update_user_name, str1, int1, + str2, int2, time1, + time2) + values (#{id,jdbcType=INTEGER}, #{masterId,jdbcType=NVARCHAR}, #{paperPosition,jdbcType=NVARCHAR}, + #{createTime,jdbcType=VARCHAR}, #{createUserName,jdbcType=NVARCHAR}, #{updateTime,jdbcType=VARCHAR}, + #{updateUserName,jdbcType=NVARCHAR}, #{str1,jdbcType=NVARCHAR}, #{int1,jdbcType=INTEGER}, + #{str2,jdbcType=NVARCHAR}, #{int2,jdbcType=INTEGER}, #{time1,jdbcType=TIMESTAMP}, + #{time2,jdbcType=TIMESTAMP}) + + + insert into emr_paper_position_info + + + id, + + + master_id, + + + paper_position, + + + create_time, + + + create_user_name, + + + update_time, + + + update_user_name, + + + str1, + + + int1, + + + str2, + + + int2, + + + time1, + + + time2, + + + + + #{id,jdbcType=INTEGER}, + + + #{masterId,jdbcType=NVARCHAR}, + + + #{paperPosition,jdbcType=NVARCHAR}, + + + #{createTime,jdbcType=VARCHAR}, + + + #{createUserName,jdbcType=NVARCHAR}, + + + #{updateTime,jdbcType=VARCHAR}, + + + #{updateUserName,jdbcType=NVARCHAR}, + + + #{str1,jdbcType=NVARCHAR}, + + + #{int1,jdbcType=INTEGER}, + + + #{str2,jdbcType=NVARCHAR}, + + + #{int2,jdbcType=INTEGER}, + + + #{time1,jdbcType=TIMESTAMP}, + + + #{time2,jdbcType=TIMESTAMP}, + + + + + update emr_paper_position_info + + + master_id = #{masterId,jdbcType=NVARCHAR}, + + + paper_position = #{paperPosition,jdbcType=NVARCHAR}, + + + create_time = #{createTime,jdbcType=VARCHAR}, + + + create_user_name = #{createUserName,jdbcType=NVARCHAR}, + + + update_time = #{updateTime,jdbcType=VARCHAR}, + + + update_user_name = #{updateUserName,jdbcType=NVARCHAR}, + + + str1 = #{str1,jdbcType=NVARCHAR}, + + + int1 = #{int1,jdbcType=INTEGER}, + + + str2 = #{str2,jdbcType=NVARCHAR}, + + + int2 = #{int2,jdbcType=INTEGER}, + + + time1 = #{time1,jdbcType=TIMESTAMP}, + + + time2 = #{time2,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=INTEGER} + + + update emr_paper_position_info + set master_id = #{masterId,jdbcType=NVARCHAR}, + paper_position = #{paperPosition,jdbcType=NVARCHAR}, + create_time = #{createTime,jdbcType=VARCHAR}, + create_user_name = #{createUserName,jdbcType=NVARCHAR}, + update_time = #{updateTime,jdbcType=VARCHAR}, + update_user_name = #{updateUserName,jdbcType=NVARCHAR}, + str1 = #{str1,jdbcType=NVARCHAR}, + int1 = #{int1,jdbcType=INTEGER}, + str2 = #{str2,jdbcType=NVARCHAR}, + int2 = #{int2,jdbcType=INTEGER}, + time1 = #{time1,jdbcType=TIMESTAMP}, + time2 = #{time2,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=INTEGER} + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index 9bca686..b2fe7cf 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -102,7 +102,8 @@ t.ID_NO, t.dept_admission_to, t.admission_date_time, - t.DISCHARGE_DISPOSITION + t.DISCHARGE_DISPOSITION, + t.paper_position paperPosition FROM ( SELECT @@ -142,11 +143,13 @@ m.ID_NO, m.dept_admission_to, m.admission_date_time, - m.DISCHARGE_DISPOSITION + m.DISCHARGE_DISPOSITION, + emr_paper_position_info.paper_position FROM emr_fault_detail f RIGHT JOIN archive_master m ON f.archive_detail_id = m.id LEFT JOIN emr_lock ON emr_lock.patient_id = m.id + LEFT JOIN emr_paper_position_info ON emr_paper_position_info.master_id = m.id ) t ) AS t WHERE diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml index d635e04..4942c37 100644 --- a/src/main/resources/mapper/StatisticsMapper.xml +++ b/src/main/resources/mapper/StatisticsMapper.xml @@ -58,16 +58,18 @@ checked_datetime, archive_master.name, inp_no, - t_dictionary.Name dept_name, + archive_master.dept_name, discharge_date_time, - t_dictionary1.Name dept_admission_to, + archive_master.dept_admission_to, admission_date_time, - DATEDIFF(day,admission_date_time,discharge_date_time) days + DATEDIFF(day,admission_date_time,discharge_date_time) days, + emr_fault_detail.first_trial finalApproveContent FROM archive_master LEFT JOIN - t_dictionary on archive_master.dept_name = t_dictionary.code and t_dictionary.typeCode='dept_code' - LEFT JOIN - t_dictionary t_dictionary1 on archive_master.dept_name = t_dictionary1.code and t_dictionary1.typeCode='dept_code' + emr_fault_detail + ON + CONVERT(varchar(19),archive_master.checked_datetime) = emr_fault_detail.create_time + AND archive_master.id = emr_fault_detail.archive_detail_id WHERE checked_datetime is not null diff --git a/src/main/resources/mapper/TPrintinfoMapper.xml b/src/main/resources/mapper/TPrintinfoMapper.xml index 5d218f1..df55819 100644 --- a/src/main/resources/mapper/TPrintinfoMapper.xml +++ b/src/main/resources/mapper/TPrintinfoMapper.xml @@ -32,6 +32,9 @@ select * from t_PrintInfo where patient_id = #{patientId} \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf index 5429199..9269222 100644 --- a/src/main/webapp/WEB-INF/jspf/comm.jspf +++ b/src/main/webapp/WEB-INF/jspf/comm.jspf @@ -54,7 +54,7 @@ * 判断出院日期是否是1801-02-03 * */ function operDisDate(value){ - if(value != ''){ + if(value != '' && value != null){ value = value.substring(0, 10); if(value == '1801-02-03'){ return ''; @@ -66,7 +66,7 @@ * 判断出院时间是否是1801-02-03 * */ function operDisTime(value){ - if(value != '' && '1801-02-03' == value.substring(0, 10)){ + if(value != '' && value != null && '1801-02-03' == value.substring(0, 10)){ value = ''; } return value; diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 942bb8f..a1db542 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -338,7 +338,7 @@
完整性审核: - 测试完整性 +
@@ -1707,7 +1707,8 @@ events: { 'click .verifyInfo': function (e, value, row, index) { //查询his判断医生护士是否全部提交 - var result = selectHis(row); + var result = 1; + //var result = selectHis(row); if (result == 1) { $('#verifyModal').modal({ backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。 diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 4bf0663..5e6b033 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -77,7 +77,12 @@ deptList = uniq(deptArr); } var depts = ''; - if(deptList != ''){ + //判断是否包含免科室 + var isAllDept = false; + if(list[0].deptId != null){ + isAllDept = judgeIsAllDept(list[0].deptId); + } + if(deptList != '' && !isAllDept){ for (var i = 0; i < deptList.length; i++) { if(i != deptList.length-1){ depts += deptList[i] + ","; @@ -134,9 +139,35 @@ $("#stateBtn").click(function () { $('#exampleModal').modal('hide'); //手动关闭 }); + //判断是否免科室 + function judgeIsAllDept(deptIdTemp){ + //获取免科室的科室集合 + var isAllDeptIds = $("#isAllDeptIds").val(); + if(isAllDeptIds != ''){ + var isAllDeptIdArr = isAllDeptIds.split(","); + var deptIdTempArr = deptIdTemp.split(","); + //判断该登陆者所属科室是否包含在免科室内 + for(var i = 0;i + +
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 1525c1f..a722905 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -655,12 +655,16 @@