diff --git a/src/main/java/com/emr/controller/medicalOverdueController.java b/src/main/java/com/emr/controller/medicalOverdueController.java index 1ce5b438..c6d8f8c4 100644 --- a/src/main/java/com/emr/controller/medicalOverdueController.java +++ b/src/main/java/com/emr/controller/medicalOverdueController.java @@ -1,9 +1,14 @@ package com.emr.controller; +import com.alibaba.fastjson.JSONObject; +import com.emr.dao.MedicalRecordHomepageCacheMapper; import com.emr.entity.Archive_Master_Vo; +import com.emr.entity.MedicalRecordHomepageCache; +import com.emr.entity.MedicalRecordHomepageCacheExample; import com.emr.entity.OffsetLimitPage; import com.emr.service.Archive_MasterService; import com.emr.util.ThreadExcelUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -22,6 +27,9 @@ public class medicalOverdueController { @Autowired private Archive_MasterService archiveMasterService; + @Autowired + private MedicalRecordHomepageCacheMapper medicalRecordHomepageCacheMapper; + @RequestMapping("/medicalOverdues") public String medicalOverdues(Model model){ return "medicalOverdueDir/medicalOverdueList"; @@ -52,6 +60,9 @@ public class medicalOverdueController { String fileName = "首次签收超期列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //构造excel的数据overdueDays List list = archiveMasterService.selectOverdue(archiveMasterVo); + + List medicalRecordHomepageCacheList = null; + if(archiveMasterVo.getOverdueDays()!=null && archiveMasterVo.getOverdueDays()!="") { if (list != null && list.size() > 0) { for (int i = 0; i < list.size(); i++) { @@ -59,6 +70,30 @@ public class medicalOverdueController { int score = Integer.parseInt(list.get(i).getOverdue()) - Integer.parseInt(archiveMasterVo.getOverdueDays()); list.get(i).setScore("" + score); } + //2021-09-17 + String doctorInChargeInHomePage = ""; + + //根据masterId查出该条首页缓存表中content内容 + MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample(); + MedicalRecordHomepageCacheExample.Criteria criteria = medicalRecordHomepageCacheExample.createCriteria(); + if (!StringUtils.isEmpty(list.get(i).getId())){ + criteria.andMasterIdEqualTo(list.get(i).getId()); + } + medicalRecordHomepageCacheList = medicalRecordHomepageCacheMapper.selectByExample(medicalRecordHomepageCacheExample); + + if (medicalRecordHomepageCacheList.size()>0){ + //查出content + String content = medicalRecordHomepageCacheList.get(0).getContent(); + //根据content内容获取首页中主治医生name + doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054"); + } + //重新赋值主管医生 + if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){ + list.get(i).setDoctorInCharge(doctorInChargeInHomePage); + }else { + list.get(i).setDoctorInCharge("首页尚未填写主治医生!"); + } + //2021-09-17 } } } diff --git a/src/main/java/com/emr/dao/MedicalRecordHomepageCacheMapper.java b/src/main/java/com/emr/dao/MedicalRecordHomepageCacheMapper.java new file mode 100644 index 00000000..24fdc6dc --- /dev/null +++ b/src/main/java/com/emr/dao/MedicalRecordHomepageCacheMapper.java @@ -0,0 +1,21 @@ +package com.emr.dao; + +import com.emr.entity.MedicalRecordHomepageCache; +import com.emr.entity.MedicalRecordHomepageCacheExample; +import java.util.List; + +public interface MedicalRecordHomepageCacheMapper { + int deleteByPrimaryKey(String masterId); + + int insert(MedicalRecordHomepageCache record); + + int insertSelective(MedicalRecordHomepageCache record); + + List selectByExample(MedicalRecordHomepageCacheExample example); + + MedicalRecordHomepageCache selectByPrimaryKey(String masterId); + + int updateByPrimaryKeySelective(MedicalRecordHomepageCache record); + + int updateByPrimaryKey(MedicalRecordHomepageCache record); +} \ No newline at end of file diff --git a/src/main/java/com/emr/entity/MedicalRecordHomepageCache.java b/src/main/java/com/emr/entity/MedicalRecordHomepageCache.java new file mode 100644 index 00000000..a26c3235 --- /dev/null +++ b/src/main/java/com/emr/entity/MedicalRecordHomepageCache.java @@ -0,0 +1,55 @@ +package com.emr.entity; + +import java.util.Date; + +public class MedicalRecordHomepageCache { + private String masterId; + + private String content; + + private Date createTime; + + private String remark; + + private Integer isAdd; + + public String getMasterId() { + return masterId; + } + + public void setMasterId(String masterId) { + this.masterId = masterId == null ? null : masterId.trim(); + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content == null ? null : content.trim(); + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark == null ? null : remark.trim(); + } + + public Integer getIsAdd() { + return isAdd; + } + + public void setIsAdd(Integer isAdd) { + this.isAdd = isAdd; + } +} \ No newline at end of file diff --git a/src/main/java/com/emr/entity/MedicalRecordHomepageCacheExample.java b/src/main/java/com/emr/entity/MedicalRecordHomepageCacheExample.java new file mode 100644 index 00000000..e42d40fa --- /dev/null +++ b/src/main/java/com/emr/entity/MedicalRecordHomepageCacheExample.java @@ -0,0 +1,531 @@ +package com.emr.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class MedicalRecordHomepageCacheExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public MedicalRecordHomepageCacheExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andMasterIdIsNull() { + addCriterion("master_id is null"); + return (Criteria) this; + } + + public Criteria andMasterIdIsNotNull() { + addCriterion("master_id is not null"); + return (Criteria) this; + } + + public Criteria andMasterIdEqualTo(String value) { + addCriterion("master_id =", value, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdNotEqualTo(String value) { + addCriterion("master_id <>", value, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdGreaterThan(String value) { + addCriterion("master_id >", value, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdGreaterThanOrEqualTo(String value) { + addCriterion("master_id >=", value, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdLessThan(String value) { + addCriterion("master_id <", value, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdLessThanOrEqualTo(String value) { + addCriterion("master_id <=", value, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdLike(String value) { + addCriterion("master_id like", value, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdNotLike(String value) { + addCriterion("master_id not like", value, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdIn(List values) { + addCriterion("master_id in", values, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdNotIn(List values) { + addCriterion("master_id not in", values, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdBetween(String value1, String value2) { + addCriterion("master_id between", value1, value2, "masterId"); + return (Criteria) this; + } + + public Criteria andMasterIdNotBetween(String value1, String value2) { + addCriterion("master_id not between", value1, value2, "masterId"); + return (Criteria) this; + } + + public Criteria andContentIsNull() { + addCriterion("content is null"); + return (Criteria) this; + } + + public Criteria andContentIsNotNull() { + addCriterion("content is not null"); + return (Criteria) this; + } + + public Criteria andContentEqualTo(String value) { + addCriterion("content =", value, "content"); + return (Criteria) this; + } + + public Criteria andContentNotEqualTo(String value) { + addCriterion("content <>", value, "content"); + return (Criteria) this; + } + + public Criteria andContentGreaterThan(String value) { + addCriterion("content >", value, "content"); + return (Criteria) this; + } + + public Criteria andContentGreaterThanOrEqualTo(String value) { + addCriterion("content >=", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLessThan(String value) { + addCriterion("content <", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLessThanOrEqualTo(String value) { + addCriterion("content <=", value, "content"); + return (Criteria) this; + } + + public Criteria andContentLike(String value) { + addCriterion("content like", value, "content"); + return (Criteria) this; + } + + public Criteria andContentNotLike(String value) { + addCriterion("content not like", value, "content"); + return (Criteria) this; + } + + public Criteria andContentIn(List values) { + addCriterion("content in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentNotIn(List values) { + addCriterion("content not in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentBetween(String value1, String value2) { + addCriterion("content between", value1, value2, "content"); + return (Criteria) this; + } + + public Criteria andContentNotBetween(String value1, String value2) { + addCriterion("content not between", value1, value2, "content"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andIsAddIsNull() { + addCriterion("is_add is null"); + return (Criteria) this; + } + + public Criteria andIsAddIsNotNull() { + addCriterion("is_add is not null"); + return (Criteria) this; + } + + public Criteria andIsAddEqualTo(Integer value) { + addCriterion("is_add =", value, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddNotEqualTo(Integer value) { + addCriterion("is_add <>", value, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddGreaterThan(Integer value) { + addCriterion("is_add >", value, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddGreaterThanOrEqualTo(Integer value) { + addCriterion("is_add >=", value, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddLessThan(Integer value) { + addCriterion("is_add <", value, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddLessThanOrEqualTo(Integer value) { + addCriterion("is_add <=", value, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddIn(List values) { + addCriterion("is_add in", values, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddNotIn(List values) { + addCriterion("is_add not in", values, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddBetween(Integer value1, Integer value2) { + addCriterion("is_add between", value1, value2, "isAdd"); + return (Criteria) this; + } + + public Criteria andIsAddNotBetween(Integer value1, Integer value2) { + addCriterion("is_add not between", value1, value2, "isAdd"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ 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 a0fc3513..c21c3760 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -10,16 +10,15 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; 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; -import com.emr.entity.Emr_Dictionary; -import com.emr.entity.OffsetLimitPage; +import com.emr.dao.MedicalRecordHomepageCacheMapper; +import com.emr.entity.*; import com.emr.service.Archive_MasterService; import com.emr.service.Emr_DictionaryService; import com.emr.service.PowerUserService; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.google.common.base.Function; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.google.common.collect.Maps; @@ -38,6 +37,9 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { @Autowired private PowerUserService powerUserService; + @Autowired + private MedicalRecordHomepageCacheMapper medicalRecordHomepageCacheMapper; + @Override public Archive_Master selectById(String id) { return archiveMasterMapper.selectById(id); @@ -324,6 +326,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { PageHelper.offsetPage(offset, limit); List list = archiveMasterMapper.selectOverdue(archiveMasterVo); + List medicalRecordHomepageCacheList = null; + JSONArray powerUsers = powerUserService.getPowerUserList("1"); List powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class); if (powerUserList != null){ @@ -334,15 +338,31 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { }}); for (Archive_Master_Vo archive_master : list) { + String doctorInChargeInHomePage = ""; - JSONObject userInfo = mappedMovies.get(archive_master.getDoctorInCharge()); - if (userInfo==null){ - archive_master.setDoctorInCharge(archive_master.getDoctorInCharge()); + //根据masterId查出该条首页缓存表中content内容 + MedicalRecordHomepageCacheExample medicalRecordHomepageCacheExample = new MedicalRecordHomepageCacheExample(); + MedicalRecordHomepageCacheExample.Criteria criteria = medicalRecordHomepageCacheExample.createCriteria(); + if (!StringUtils.isEmpty(archive_master.getId())){ + criteria.andMasterIdEqualTo(archive_master.getId()); + } + medicalRecordHomepageCacheList = medicalRecordHomepageCacheMapper.selectByExample(medicalRecordHomepageCacheExample); + + if (medicalRecordHomepageCacheList.size()>0){ + //查出content + String content = medicalRecordHomepageCacheList.get(0).getContent(); + //根据content内容获取首页中主治医生name + doctorInChargeInHomePage = JSONObject.parseObject(content).getJSONObject("commonTable").getString("yZY054"); + } + //重新赋值主管医生 + if (doctorInChargeInHomePage != null && !doctorInChargeInHomePage.equals("")){ + archive_master.setDoctorInCharge(doctorInChargeInHomePage); }else { - archive_master.setDoctorInCharge(userInfo.getString("name")); + archive_master.setDoctorInCharge("首页尚未填写主治医生!"); } - userInfo = mappedMovies.get(archive_master.getFirstInstance()); + + JSONObject userInfo = mappedMovies.get(archive_master.getFirstInstance()); if (userInfo==null){ archive_master.setFirstInstance(archive_master.getFirstInstance()); }else { diff --git a/src/main/resources/mapper/MedicalRecordHomepageCacheMapper.xml b/src/main/resources/mapper/MedicalRecordHomepageCacheMapper.xml new file mode 100644 index 00000000..227f8382 --- /dev/null +++ b/src/main/resources/mapper/MedicalRecordHomepageCacheMapper.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + master_id, content, create_time, remark, is_add + + + + + delete from medical_record_homepage_cache + where master_id = #{masterId,jdbcType=VARCHAR} + + + insert into medical_record_homepage_cache (master_id, content, create_time, + remark, is_add) + values (#{masterId,jdbcType=VARCHAR}, #{content,jdbcType=NVARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{remark,jdbcType=NVARCHAR}, #{isAdd,jdbcType=INTEGER}) + + + insert into medical_record_homepage_cache + + + master_id, + + + content, + + + create_time, + + + remark, + + + is_add, + + + + + #{masterId,jdbcType=VARCHAR}, + + + #{content,jdbcType=NVARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{remark,jdbcType=NVARCHAR}, + + + #{isAdd,jdbcType=INTEGER}, + + + + + update medical_record_homepage_cache + + + content = #{content,jdbcType=NVARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + remark = #{remark,jdbcType=NVARCHAR}, + + + is_add = #{isAdd,jdbcType=INTEGER}, + + + where master_id = #{masterId,jdbcType=VARCHAR} + + + update medical_record_homepage_cache + set content = #{content,jdbcType=NVARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + remark = #{remark,jdbcType=NVARCHAR}, + is_add = #{isAdd,jdbcType=INTEGER} + where master_id = #{masterId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index db836204..b5e62286 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -4591,7 +4591,7 @@ $("#viewBtn").click(function () { debugger; var patientId=$("#patientId").html() ; - var newWindow = window.open("http://10.6.0.158:8089/hdrciv/civ/jsp/categoryView/categoryView.jsp/rpc?username=00000&patient_id="+patientId); + var newWindow = window.open("http://10.6.0.158:8089/hdrciv/civ/jsp/visitView/visitView.jsp/rpc?username=00000&patient_id="+patientId); }); //获取table的高度