From f0a0417008db1cc402ba4266476467a0cbc0396a Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Fri, 13 Nov 2020 17:21:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC20201113?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchiveOtherExtController.java | 8 +- .../controller/beHospitaledController.java | 15 ++- .../emr/controller/lastVerifyController.java | 4 + .../com/emr/dao/ArchiveOtherExtMapper.java | 8 ++ .../com/emr/dao/Archive_MasterMapper.java | 2 + .../com/emr/entity/Archive_Master_Vo.java | 4 + .../emr/service/Archive_MasterService.java | 4 + .../service/ipml/ArchiveOtherExtService.java | 9 ++ .../ipml/Archive_MasterServiceImpl.java | 98 +++++++++++----- .../service/ipml/EmrOvertimeSetService.java | 2 +- .../com/emr/service/ipml/RecordService.java | 6 +- .../emr/service/ipml/SendMessageService.java | 5 +- src/main/java/com/emr/vo/RecordSearch.java | 5 + src/main/resources/config/config.properties | 2 +- .../mapper/ArchiveOtherExtMapper.xml | 13 ++- .../resources/mapper/Archive_MasterMapper.xml | 43 +++++-- src/main/resources/mapper/RecordMapper.xml | 7 +- src/main/webapp/WEB-INF/jspf/webSocket.jspf | 9 +- .../views/beHospitaledDir/beHospList.jsp | 28 ++--- src/main/webapp/WEB-INF/views/index.jsp | 4 +- .../views/lastVerifyDir/lastVerifyList.jsp | 12 +- .../webapp/static/js/beHospList/beHospList.js | 33 ++++-- .../js/hospitalCommom/hospitalCommom.js | 107 +++++++++++------- src/main/webapp/static/js/index.js | 2 +- .../js/lastVerifyList/lastVerifyList.js | 7 +- 25 files changed, 314 insertions(+), 123 deletions(-) diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index e26c542..dd9f977 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -23,8 +23,6 @@ import java.util.List; public class ArchiveOtherExtController { @Autowired private ArchiveOtherExtService archiveOtherExtService; - @Autowired - private ArchiveOtherService archiveOtherService; /** * 任务详情列表 * @param offset @@ -96,9 +94,9 @@ public class ArchiveOtherExtController { * @return * @throws Exception */ - @RequestMapping("selectSuccessByExtIds") + @RequestMapping("selectAllByIdsAndSubmitTime") @ResponseBody - public Msg selectSuccessByExtIds(String ids,String c1) throws Exception{ + public Msg selectSuccessByExtIds(String ids) throws Exception{ if(StringUtils.isNotBlank(ids)){ String[] split = ids.split(","); StringBuilder temp = new StringBuilder(); @@ -110,7 +108,7 @@ public class ArchiveOtherExtController { temp.append("'").append(str).append("'"); } } - List list = archiveOtherService.selectAllByC2(temp.toString(),c1); + List list = archiveOtherExtService.selectAllByIdsAndSubmitTime(temp.toString()); return Msg.success().add("list",list); }else{ return Msg.fail("参数ids不能为空"); diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 1f54d6d..edcf603 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -22,6 +22,7 @@ import com.emr.vo.ArchiveFlowInfoVo; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.endpoint.Client; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.util.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -32,6 +33,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -53,9 +55,10 @@ public class beHospitaledController { @Autowired private EmrOvertimeSetService emrOvertimeSetService; @RequestMapping(value = "/beHosps") - public String inHospitals(Integer flag,Model model){ + public String inHospitals(Integer flag,Integer infoId,Model model){ if(null != flag){ model.addAttribute("flag",flag); + model.addAttribute("infoId",infoId); model.addAttribute("overDateSet",overDateSet); //获取超期提醒日期 String remindDate = emrOvertimeSetService.getRemindDate(); @@ -119,7 +122,15 @@ public class beHospitaledController { public Msg getFlowRole() throws Exception{ //查询审核角色集合，根据有效进行计算状态code List archiveFlowRoles = flowRoleMapper.selectAll(); - return Msg.success().add("list",archiveFlowRoles); + List list = new ArrayList<>(); + if(!CollectionUtils.isEmpty(archiveFlowRoles)){ + for(ArchiveFlowRole obj : archiveFlowRoles){ + if(null != obj.getStepIndex() && null != obj.getRole()){ + list.add(obj); + } + } + } + return Msg.success().add("list",list); } @ResponseBody diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index 4ff71f6..ca9edb9 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -75,6 +75,8 @@ public class lastVerifyController { archiveMasterVo.setEndDateTo(null); } try { + //是否查询纸质签收状态的相关处理 + archiveMasterService.setLastVerifyList(archiveMasterVo); OffsetLimitPage offsetLimitPage = archiveMasterService.selectByLast(archiveMasterVo, offset, limit); return offsetLimitPage; } catch (Exception e) { @@ -96,6 +98,8 @@ public class lastVerifyController { String tableThNames = "住院号,住院次数,名字,性别,出院科室,出院日期,主管医生,状态"; String fieldCns = "inpNo,visitId,name,sex,deptName,dischargeDateTime,doctorInCharge,status"; try { + //是否查询纸质签收状态的相关处理 + archiveMasterService.setLastVerifyList(archiveMasterVo); //构造excel的数据 List list = archiveMasterService.selectLastVerifyList(archiveMasterVo); diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index 9efe31f..21ea4b7 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -1,5 +1,6 @@ package com.emr.dao; +import com.emr.entity.ArchiveOther; import com.emr.entity.ArchiveOtherExt; import com.emr.vo.ArchiveOtherExtVo; import org.apache.ibatis.annotations.Param; @@ -24,4 +25,11 @@ public interface ArchiveOtherExtMapper { List selectAllByIds(@Param("ids") String ids); //int updateSubmit(@Param("ids")String ids); + + /** + * 根据ids字段的查询与同步更新比较时间比较较晚时间的集合 + * @param ids + * @return + */ + List selectAllByIdsAndSubmitTime(@Param("ids")String ids); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index 5ac7796..6860a36 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -53,4 +53,6 @@ public interface Archive_MasterMapper { List loadDoctorInCharge(@Param("deptName") String deptName); List loadOverTimeDoctorInCharge(); + + List selectPatientIdsForSign(); } \ 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 59247b8..5026251 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -55,6 +55,10 @@ public class Archive_Master_Vo extends Archive_Master{ private String doctorInChargeCode;//主管医生工号 private String userName;//登录用户 + + private Integer isSign;//是否查询纸质签收状态 + + private List patientIdsForSign;//已纸质签收集合 } diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 5109587..c0aede1 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -118,9 +118,13 @@ public interface Archive_MasterService { List selectLastVerifyList(Archive_Master_Vo archiveMasterVo); + Archive_Master_Vo setLastVerifyList(Archive_Master_Vo vo); + List loadDoctorInCharge(String deptName); List loadOverTimeDoctorInCharge(); + + List selectOracleGetSignList(StringBuilder patientIdStr, List selectList); } diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index dcf844b..643bb80 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -294,4 +294,13 @@ public class ArchiveOtherExtService { archiveOtherExtSubmittimeMapper.createInfo(createList); } } + + /** + * 根据ids字段的查询与同步更新比较时间比较较晚时间的集合 + * @param ids + * @return + */ + public List selectAllByIdsAndSubmitTime(String ids) { + return archiveOtherExtMapper.selectAllByIdsAndSubmitTime(ids); + } } 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 515e803..3db5086 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -27,7 +27,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -190,6 +189,39 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return new OffsetLimitPage((Page) list); } + /** + * 查询纸质签收情况 + * @param vo + * @return + */ + @Override + public Archive_Master_Vo setLastVerifyList(Archive_Master_Vo vo) { + if(null != vo.getIsSign()){ + //查询护士长已审核与召回病历记账号集合 + List masters = archiveMasterMapper.selectPatientIdsForSign(); + //处理记账号返回字符串 + StringBuilder patientIds = new StringBuilder(); + if(!CollectionUtils.isEmpty(masters)){ + for(Archive_Master master : masters){ + if(StringUtils.isNotBlank(master.getPatientId())){ + if(StringUtils.isNotBlank(patientIds)){ + patientIds.append(","); + } + patientIds.append("'").append(master.getPatientId()).append("'"); + } + } + } + //将查询结果带入查询oracle返回集合 + List selectList = new ArrayList<>(); + //selectList.add("1304063"); + //selectList.add("1304458"); + selectList = selectOracleGetSignList(patientIds,selectList); + //设置进查询条件 + vo.setPatientIdsForSign(selectList); + } + return vo; + } + /** * 终审列表 * */ @@ -236,28 +268,21 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //赋值纸质扫描上传情况 List details = detailMapper.selectIsScan(patientIdStr.toString(),1); //赋值签收情况 - //查询签收情况 - String sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" + - "and freg_date is not null"; + List selectList = new ArrayList<>(); try{ - //执行查询 - List selectList = new ArrayList<>(); - try{ - selectList = OracleConnect.selectList(sql); - }catch (Exception e){ - e.printStackTrace(); - ExceptionPrintUtil.printException(e); - } + selectList = selectOracleGetSignList(patientIdStr, selectList); for (Archive_Master_Vo masterVo : list) { - masterVo.setRemark("未签收"); - //赋值 - if(!CollectionUtils.isEmpty(selectList)){ - String patientId = masterVo.getPatientId(); - if(StringUtils.isNotBlank(patientId)) { - for (String str : selectList) { - if(str.equals(patientId)){ - masterVo.setRemark("已签收"); - break; + if(null == archiveMasterVo.getIsSign()) { + masterVo.setRemark("未签收"); + //赋值 + if (!CollectionUtils.isEmpty(selectList)) { + String patientId = masterVo.getPatientId(); + if (StringUtils.isNotBlank(patientId)) { + for (String str : selectList) { + if (str.equals(patientId)) { + masterVo.setRemark("已签收"); + break; + } } } } @@ -397,14 +422,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } for (Archive_Master_Vo vo:list) { - //转换总费用d1 - BigDecimal d1 = vo.getD1(); - if(d1 != null) { - java.text.DecimalFormat myformat=new java.text.DecimalFormat("0.00"); - String d1Str = myformat.format(d1); - }else{ - vo.setD1(new BigDecimal(0)); - } //科室名称编码转名称 deptNameCode2Name(dictionaries, vo); //赋值出院天数 @@ -1123,6 +1140,29 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { } return null; } + + /** + * 查oracle视图，带记账号查询纸质签收的记账号集合 + * @param patientIdStr + * @return + */ + @Override + public List selectOracleGetSignList(StringBuilder patientIdStr, List selectList){ + //查询签收情况 + String sql = "select fpat_no from v_jswzh_archive_bqreg where fpat_no in ("+patientIdStr.toString()+")" + + "and freg_date is not null"; + //执行查询 + try{ + long start = System.currentTimeMillis(); + selectList = OracleConnect.selectList(sql); + long end = System.currentTimeMillis(); + log.info("查询oracle的纸质病历签收集合使用时间:"+(end-start)/1000+"s"); + }catch (Exception e){ + e.printStackTrace(); + ExceptionPrintUtil.printException(e); + } + return selectList; + } } diff --git a/src/main/java/com/emr/service/ipml/EmrOvertimeSetService.java b/src/main/java/com/emr/service/ipml/EmrOvertimeSetService.java index bbd052f..1262dfa 100644 --- a/src/main/java/com/emr/service/ipml/EmrOvertimeSetService.java +++ b/src/main/java/com/emr/service/ipml/EmrOvertimeSetService.java @@ -252,7 +252,7 @@ public class EmrOvertimeSetService { //获取提前超期天数 Integer surplusDays = emrOvertimeSet.getSurplusDays(); if(workDateList.size() >= surplusDays){ - return workDateList.get(surplusDays).getDate(); + return workDateList.get(emrOvertimeSet.getDays() - surplusDays + 1).getDate(); } } return null; diff --git a/src/main/java/com/emr/service/ipml/RecordService.java b/src/main/java/com/emr/service/ipml/RecordService.java index 78118f5..914f6bf 100644 --- a/src/main/java/com/emr/service/ipml/RecordService.java +++ b/src/main/java/com/emr/service/ipml/RecordService.java @@ -104,7 +104,7 @@ public class RecordService { public SubmitRecordStatistics selectCount(RecordSearch recordSearch) { SubmitRecordStatistics record = recordMapper.selectCount(recordSearch); //计算百分比并赋值 - SetStatisticsPercent(record); + setStatisticsPercent(record); return record; } @@ -128,7 +128,7 @@ public class RecordService { if(!CollectionUtils.isEmpty(list)){ for (SubmitRecordStatistics obj:list) { //计算百分比并赋值 - SetStatisticsPercent(obj); + setStatisticsPercent(obj); obj.setDeptNameCn(deptNameCn); } } @@ -139,7 +139,7 @@ public class RecordService { * 设置提交报表百分比并赋值 * @param record */ - private void SetStatisticsPercent(SubmitRecordStatistics record) { + private void setStatisticsPercent(SubmitRecordStatistics record) { Integer count = record.getAllCount(); if (count != 0) { record.setCount1Percent(Math.round(record.getCount1() * 100 / count) + "%"); diff --git a/src/main/java/com/emr/service/ipml/SendMessageService.java b/src/main/java/com/emr/service/ipml/SendMessageService.java index 3ad851d..8296712 100644 --- a/src/main/java/com/emr/service/ipml/SendMessageService.java +++ b/src/main/java/com/emr/service/ipml/SendMessageService.java @@ -145,14 +145,15 @@ public class SendMessageService { } //获取角色名称与角色称呼、infoId List roleList = selectInfoIdAndRoleName(user.getRoleId()); - recordSearch.setInfoId(Integer.valueOf(roleList.get(2))); + int infoId = Integer.valueOf(roleList.get(2)); + recordSearch.setInfoId(infoId); //查询该用户即将到期的待审核病历数 int count = recordMapper.selectCountOverTimeByRoleId(recordSearch); if(count > 0) { //组织通知内容 XXX医生或护士，您有X份病历是XX（角色）待审核状态，请及时查阅 String content = selectContentByRole(user.getUserPosition(), count, roleList); //调用权限系统发送消息接口 - sendMessage(user.getUserId(), content,"sendOverTimeMessage"); + sendMessage(user.getUserId(), content,"sendOverTimeMessage_"+infoId); } } } diff --git a/src/main/java/com/emr/vo/RecordSearch.java b/src/main/java/com/emr/vo/RecordSearch.java index 012ebc5..e3e0c98 100644 --- a/src/main/java/com/emr/vo/RecordSearch.java +++ b/src/main/java/com/emr/vo/RecordSearch.java @@ -56,4 +56,9 @@ public class RecordSearch { * 距超期剩余天数 */ private Integer surplus; + + /** + * 是否纸质签收视为归档 + */ + private Integer isPaperSign; } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 7052db2..b0a6399 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -2,7 +2,7 @@ #POWER_IP = 192.168.1.3 #POWER_PORT = 8081 -POWER_IP = 200.100.104.40 +POWER_IP = 200.100.104.43 POWER_PORT = 8081 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index e689c1c..5b20e66 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -524,4 +524,15 @@ --> - \ No newline at end of file + + + diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 2d4cb8d..0de92cf 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -219,6 +219,10 @@ and ArchiveState != '1024' and ArchiveState != '128' and YEAR(discharge_date_time) != '1801' + /**根据待审核节点查询*/ + + /**根据审核状态查询*/ + and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' @@ -389,19 +393,19 @@ - AND ArchiveState IN ('2','18','50','514','6','22','54','518','14','30','526','64','1024') + AND ArchiveState IN ('2','18','50','514','768','6','22','54','518','14','30','62','526','64','1024') - AND ArchiveState IN ('6','22','54','518','14','30','526','64','1024') + AND ArchiveState IN ('6','22','54','518','14','30','62','526','64','1024') - AND ArchiveState IN ('14','30','526','64','1024') + AND ArchiveState IN ('14','30','62','526','64','1024') - AND ArchiveState IN ('16','18','22','40','528','48','50','54','304','64','1024') + AND ArchiveState IN ('16','18','22','40','528','768','48','50','54','62','304','64','1024') - AND ArchiveState IN ('48','50','54','304','64','1024') + AND ArchiveState IN ('48','50','54','62','304','64','1024') AND ArchiveState IN ('64') @@ -497,7 +501,28 @@ days END from emr_overtime_set where id = 1) days from archive_master m - where 1=1 and (ArchiveState = '64' or ArchiveState = '1024') + where 1=1 and ArchiveState in ('64','1024') + + + and patient_id + + + + in + + + not in + + + ( + + + #{item} + + '无效' + + ) + and m.id = #{id,jdbcType=NVARCHAR} @@ -555,7 +580,6 @@ and m.admission_date_time <= #{endDate,jdbcType=NCHAR}+ ' 23:59:59' - and m.check_doctor = #{checkDoctor,jdbcType=NVARCHAR} @@ -1152,4 +1176,9 @@ ORDER BY DOCTOR_IN_CHARGE + + \ No newline at end of file diff --git a/src/main/resources/mapper/RecordMapper.xml b/src/main/resources/mapper/RecordMapper.xml index a1e6ab6..306fc08 100644 --- a/src/main/resources/mapper/RecordMapper.xml +++ b/src/main/resources/mapper/RecordMapper.xml @@ -256,7 +256,12 @@ ) allCount, ( SELECT COUNT( 1 ) FROM archive_master WHERE (ArchiveState = '64' or ArchiveState = '128' or ArchiveState = '1024') ) count1, - ( SELECT COUNT( 1 ) FROM archive_master WHERE ArchiveState = '128' + ( SELECT COUNT( 1 ) FROM archive_master WHERE ArchiveState = '128' + + + OR ArchiveState = '64' + + ) count2, ( SELECT diff --git a/src/main/webapp/WEB-INF/jspf/webSocket.jspf b/src/main/webapp/WEB-INF/jspf/webSocket.jspf index 1ffce31..bc661e2 100644 --- a/src/main/webapp/WEB-INF/jspf/webSocket.jspf +++ b/src/main/webapp/WEB-INF/jspf/webSocket.jspf @@ -46,7 +46,7 @@ } } //跳转到出院浏览待审核页面 - function returnUnSubmitPage(){ + function returnUnSubmitPage(infoId){ var url = ''; //获取登录者角色id var roleId = $("#roleId").val(); @@ -55,7 +55,7 @@ url = path + "/lastVerify/lastVerifys?flag=1"; }else{ //其余跳转出院浏览 - url = path + "/beHosp/beHosps?flag=1"; + url = path + "/beHosp/beHosps?flag=1&infoId="+infoId; } $("#iFrame1").prop("src",url); } @@ -91,9 +91,10 @@ buttons: [{ text: '查看详情', click: function (e) { - if(typeFlag == 'sendOverTimeMessage') { + if(typeFlag.indexOf('sendOverTimeMessage') != -1) { + var infoId = typeFlag.split("_")[1]; //跳转归档系统待审核页面 - returnUnSubmitPage(); + returnUnSubmitPage(infoId); }else{ //跳转权限系统读取通知页面 noticeManage1(typeFlag); diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 07e6874..ef5fccb 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -146,6 +146,8 @@ + +
@@ -207,11 +209,11 @@
- <%--
+
@@ -219,15 +221,15 @@ -
--%> +
@@ -274,7 +276,7 @@
-
+
病历信息
@@ -825,7 +827,7 @@
- - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index 130b3ea..220aa3a 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -355,7 +355,7 @@