From 3a82ef46ef4ebe989c40b8ebd262893ab69d376c Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Fri, 22 Sep 2023 16:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/beHospitaledController.java | 9 +- .../com/emr/dao/Archive_MasterMapper.java | 3 + .../ipml/Archive_DetailServiceImpl.java | 13 +++ .../ipml/Archive_MasterServiceImpl.java | 7 +- src/main/resources/config/config.properties | 2 +- .../resources/mapper/Archive_MasterMapper.xml | 91 +++++++++++++++++++ .../views/beHospitaledDir/beHospList.jsp | 4 +- .../views/beHospitaledDir/beHospList1.jsp | 4 +- .../views/lastVerifyDir/lastVerifyList.jsp | 4 +- .../webapp/static/js/beHospList/beHospList.js | 6 +- .../static/js/beHospList/beHospList1.js | 12 +-- .../js/hospitalCommom/hospitalCommom.js | 16 ++-- .../js/lastVerifyList/lastVerifyList.js | 11 ++- 13 files changed, 147 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index b7d1e22..74fbeae 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -209,10 +209,11 @@ public class beHospitaledController { @ResponseBody @RequestMapping(value = "/updateStateByArchivId") public Msg updateStateByArchivId(HttpServletRequest request,Archive_Master_Vo master) throws Exception{ - boolean flag = FormTokenFlagUtil.isFlag(request); - if (!flag) { - return Msg.fail("请不要重复提交!"); - } + //2023/6/5注释提交重复 +// boolean flag = FormTokenFlagUtil.isFlag(request); +// if (!flag) { +// return Msg.fail("请不要重复提交!"); +// } return archiveMasterService.updateStateByArchivId(master); } diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index a74ba68..7706594 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -2,6 +2,7 @@ package com.emr.dao; import com.emr.entity.Archive_Master; import com.emr.entity.Archive_Master_Vo; +import com.emr.vo.CommomVo; import com.emr.vo.DoctorStatistics; import com.emr.vo.RecordCommonVo; import com.emr.vo.RecordStatisticsHome; @@ -48,6 +49,8 @@ public interface Archive_MasterMapper { * */ List selectFiled(Archive_Master_Vo master); + int insertCommonlyUsed(CommomVo commomVo); + /** * 根据masterIds集合批量更新LockInfo字段 * @param masterIds diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index dd702e4..c0ea359 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -133,6 +133,9 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { if (source.equals("PACS系统采集服务")){ record.setSource("'3','PACS系统采集服务'"); } + if (!source.equals("移动护理系统采集服务")&&!source.equals("PACS系统采集服务")&&StringUtils.isNotBlank(source)){ + record.setSource("'"+ source + "'"); + } List list = archiveDetailMapper.detailByClo(record); OffsetLimitPage offsetLimitPage = new OffsetLimitPage((Page) list); if(!CollectionUtils.isEmpty(list)) { @@ -153,6 +156,16 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { if (detailVo1.getAssortId().equals(nurseAssortId) && detailVo1.getTitle().contains(nurseTemp)) { nurseDetailVoTemp = detailVo1; } + if (StringUtils.isNotBlank(detailVo1.getSource())){ + if (detailVo1.getSource().equals("1")){ + detailVo1.setSource("移动护理系统采集服务"); + } + } + if (StringUtils.isNotBlank(detailVo1.getSource())){ + if (detailVo1.getSource().equals("3")){ + detailVo1.setSource("PACS系统采集服务"); + } + } //页码为0的读取pdf文件重置页码 setPdfPages(detailVo1); } 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 f594f50..6c34d03 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -64,6 +64,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { private ArchiveForceSumbitInfoService archiveForceSumbitInfoService; @Autowired private ArchiveOtherExtMapper archiveOtherExtMapper; + @Autowired + private Archive_MasterMapper archive_masterMapper; /** * 在院列表 @@ -1110,7 +1112,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return Msg.fail("初始状态出错了!"); } } - return Msg.fail("该病理正处于召回状态不允许提交!"); + return Msg.fail("该病历正处于召回状态不允许提交!"); } /** @@ -1298,7 +1300,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { for (Archive_Master list : archive_masterVos) { commomVo.setPatientId(list.getId()); commomVo.setAdmissTimes(list.getVisitId()); - commomVo.setInpatientNo(list.getIdNo()); + commomVo.setInpatientNo(list.getInpNo()); commomVo.setName(list.getName()); commomVo.setAdmissId(list.getPatientId()); commomVo.setSex(list.getSex()); @@ -1306,6 +1308,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { commomVo.setDisDate(list.getDischargeDateTime()); commomVo.setDisDept(list.getDeptNameCode()); commomVo.setAttending(list.getDoctorInCharge()); + archive_masterMapper.insertCommonlyUsed(commomVo); } if (StringUtils.isNotBlank(id)) { //修改病案归档状态 diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index e30471f..ee46cf2 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -74,6 +74,6 @@ oraclePassWord = Jswzh calculationTime= 2022/08/01 -qualitySwitch=1 +qualitySwitch=2 diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index c6d135f..ccfbd3c 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -886,6 +886,97 @@ ORDER BY m.discharge_date_time desc + + insert into commomtable + + + patient_id, + + + admiss_times, + + + inpatient_no, + + + name, + + + sex, + + + age, + + + admiss_date, + + + dis_date, + + + dis_dept, + + + checked_datetime, + + + admiss_id, + + + age_month, + + + attending, + + + admiss_days, + + + + + #{patientId,jdbcType=NVARCHAR}, + + + #{admissTimes,jdbcType=INTEGER}, + + + #{inpatientNo,jdbcType=NVARCHAR}, + + + #{name,jdbcType=NVARCHAR}, + + + #{sex,jdbcType=NVARCHAR}, + + + #{age,jdbcType=NVARCHAR}, + + + #{admissDate}, + + + #{disDate}, + + + #{disDept,jdbcType=NVARCHAR}, + + + #{checkedDatetime,jdbcType=NVARCHAR}, + + + #{admissId,jdbcType=NVARCHAR}, + + + #{ageMonth,jdbcType=NVARCHAR}, + + + #{attending,jdbcType=NVARCHAR}, + + + #{admissDays,jdbcType=INTEGER}, + + + - - + +
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp index 09a79e7..572a9e0 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp @@ -237,8 +237,8 @@
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 9f2bf89..ffa9937 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -200,8 +200,8 @@
diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index bd6c51f..48ea3bb 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -133,7 +133,7 @@ function initTable() { }, { title: '状态', - field: 'status', + field: 'currentStatus', align: 'center', valign: 'middle', formatter: paramsMatter @@ -159,9 +159,9 @@ function initTable() { formatter: function (value, row) { var callBackStatus = row.callBackStatus; if (callBackStatus == '召回完成' ||callBackStatus == '召回中') { - return '已召回'; + return '召回完成'; } else { - return '否'; + return '未召回'; } } }, diff --git a/src/main/webapp/static/js/beHospList/beHospList1.js b/src/main/webapp/static/js/beHospList/beHospList1.js index f6fb62e..9e0b171 100644 --- a/src/main/webapp/static/js/beHospList/beHospList1.js +++ b/src/main/webapp/static/js/beHospList/beHospList1.js @@ -155,12 +155,12 @@ function initTable() { field: 'hisStatic', align: 'center', valign: 'middle', - formatter:function(value, row){ - var hisStatic = row.hisStatic; - if(hisStatic == '已召回'){ - return ''+hisStatic+''; - }else{ - return '否'; + formatter: function (value, row) { + var callBackStatus = row.callBackStatus; + if (callBackStatus == '召回完成' ||callBackStatus == '召回中') { + return '召回完成'; + } else { + return '未召回'; } } }, diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index 5cb7831..d763607 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -705,14 +705,14 @@ function initTable2() { align: 'center', valign: 'middle', width: 50, // 定义列的宽度，单位为像素px - formatter:function(value, row){ - if(value=="1"){ - return '移动护理系统采集服务'; - } - if(value=="3"){ - return 'PACS系统采集服务'; - } - } + // formatter:function(value, row){ + // if(value=="1"){ + // return '移动护理系统采集服务'; + // } + // if(value=="3"){ + // return 'PACS系统采集服务'; + // } + // } }, { title: '状态', diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index 309587a..f975d3e 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -190,13 +190,14 @@ function initTable() { }, { title: 'HIS召回状态', - field: 'callBackStatus', + field: 'hisStatic', align: 'center', valign: 'middle', - formatter:function(value, row){ - if(value != '否'){ - return ''+value+''; - }else{ + formatter: function (value, row) { + var callBackStatus = row.callBackStatus; + if (callBackStatus == '召回完成' ||callBackStatus == '召回中') { + return '召回完成'; + } else { return '未召回'; } }