diff --git a/doc/qf_record.bak b/doc/qf_record.bak index 7f1202c..eda8420 100644 Binary files a/doc/qf_record.bak and b/doc/qf_record.bak differ diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java index 9346da9..60e4c00 100644 --- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java +++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java @@ -1034,16 +1034,16 @@ public class CommomSearchController { private static String toChinese(String str) { String[] s1 = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"}; String[] s2 = {"十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千"}; - String result = ""; + StringBuilder result = new StringBuilder(); int n = str.length(); for (int i = 0; i < n; i++) { int num = str.charAt(i) - '0'; if (i != n - 1 && num != 0) { - result += s1[num] + s2[n - 2 - i]; + result.append(s1[num]).append(s2[n - 2 - i]); } else { - result += s1[num]; + result.append(s1[num]); } } - return result; + return result.toString(); } } diff --git a/src/main/java/com/emr/controller/distributionManage/DistributionController.java b/src/main/java/com/emr/controller/distributionManage/DistributionController.java index 38e94c3..2dbfb00 100644 --- a/src/main/java/com/emr/controller/distributionManage/DistributionController.java +++ b/src/main/java/com/emr/controller/distributionManage/DistributionController.java @@ -346,9 +346,7 @@ public class DistributionController { list.add(roleReader); } } - if(!CollectionUtils.isEmpty(list)) { - roleRearderService.SimpleInsert(list); - } + roleRearderService.SimpleInsert(list); } if(null != userId) { //与角色分配表对比，多出部分，flag设为1，减少部分flag设为0 @@ -402,9 +400,7 @@ public class DistributionController { } } } - if(!CollectionUtils.isEmpty(list)) { - userRearderService.SimpleInsert(list); - } + userRearderService.SimpleInsert(list); } return ResultUtil.ok(); } diff --git a/src/main/java/com/emr/controller/otherManage/monitoringCenterController.java b/src/main/java/com/emr/controller/otherManage/monitoringCenterController.java index 4a7d2c4..d213907 100644 --- a/src/main/java/com/emr/controller/otherManage/monitoringCenterController.java +++ b/src/main/java/com/emr/controller/otherManage/monitoringCenterController.java @@ -85,12 +85,7 @@ public class monitoringCenterController { } } //查询总盘数 - List phNums = scanPathMapper.selectCountPh(); - for (Integer phNum : phNums) { - if (0 != phNum) { - phCount += 1; - } - } + phCount = scanPathMapper.selectCountPh(); //查询图像总数 pdfCount = scanPathMapper.selectCountPdf(); } catch (ParseException e) { diff --git a/src/main/java/com/emr/dao/CommomMapper.java b/src/main/java/com/emr/dao/CommomMapper.java index eb6e2f7..5570943 100644 --- a/src/main/java/com/emr/dao/CommomMapper.java +++ b/src/main/java/com/emr/dao/CommomMapper.java @@ -106,4 +106,6 @@ public interface CommomMapper { * 修改病案备注 */ int updateRecordReMark(CommomVo commomVo); + + void SimpleInsert(@Param("list")List list); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/commomSearch/ScanPathMapper.java b/src/main/java/com/emr/dao/commomSearch/ScanPathMapper.java index 5e42b32..6592863 100644 --- a/src/main/java/com/emr/dao/commomSearch/ScanPathMapper.java +++ b/src/main/java/com/emr/dao/commomSearch/ScanPathMapper.java @@ -24,7 +24,7 @@ public interface ScanPathMapper { * 查询盘号数量 * @return */ - List selectCountPh(); + Integer selectCountPh(); /** * 查询图像总数 diff --git a/src/main/java/com/emr/dao/emrCode/T_DiagMapper.java b/src/main/java/com/emr/dao/emrCode/T_DiagMapper.java index bcdc637..ac777cd 100644 --- a/src/main/java/com/emr/dao/emrCode/T_DiagMapper.java +++ b/src/main/java/com/emr/dao/emrCode/T_DiagMapper.java @@ -1,11 +1,12 @@ package com.emr.dao.emrCode; +import com.emr.dao.CommomMapper; import com.emr.entity.emrCode.T_Diag; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface T_DiagMapper { +public interface T_DiagMapper extends CommomMapper { int insert(T_Diag record); int insertSelective(T_Diag record); @@ -16,7 +17,5 @@ public interface T_DiagMapper { void deleteDiagByPatientIdAndDiagNo(@Param("patientId")String patientId,@Param("diagNos")String diagNos); - int SimpleInsert(@Param("list")List list); - int SimpleUpdate(@Param("list")List list); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/emrCode/T_OperateMapper.java b/src/main/java/com/emr/dao/emrCode/T_OperateMapper.java index 0677ddc..37dfed0 100644 --- a/src/main/java/com/emr/dao/emrCode/T_OperateMapper.java +++ b/src/main/java/com/emr/dao/emrCode/T_OperateMapper.java @@ -1,11 +1,12 @@ package com.emr.dao.emrCode; +import com.emr.dao.CommomMapper; import com.emr.entity.emrCode.T_Operate; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface T_OperateMapper { +public interface T_OperateMapper extends CommomMapper { int insert(T_Operate record); int insertSelective(); @@ -16,7 +17,5 @@ public interface T_OperateMapper { void deleteOperCodeByPatientIdAndOperNo(@Param("patientId")String patientId,@Param("operateNo")String operateNo); - int SimpleInsert(@Param("list")List list); - int SimpleUpdate(@Param("list")List list); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.java b/src/main/java/com/emr/dao/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.java index 3867bd5..b4285e0 100644 --- a/src/main/java/com/emr/dao/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.java +++ b/src/main/java/com/emr/dao/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.java @@ -1,18 +1,17 @@ package com.emr.dao.emrPrintAndDownLoad; +import com.emr.dao.CommomMapper; import com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo; import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface EmrPrintDownloadInfoMapper { +public interface EmrPrintDownloadInfoMapper extends CommomMapper { int insert(EmrPrintDownloadInfo record); int insertSelective(EmrPrintDownloadInfo record); - int SimpleInsert(List list); - List selectAll(@Param("record") EmrPrintOrDownLoadInfoVo record); List selectAllByIds(@Param("ids")String ids,@Param("flag")String flag); diff --git a/src/main/java/com/emr/dao/emrRoleReader/Emr_Role_ReaderMapper.java b/src/main/java/com/emr/dao/emrRoleReader/Emr_Role_ReaderMapper.java index 361f5a8..10b5829 100644 --- a/src/main/java/com/emr/dao/emrRoleReader/Emr_Role_ReaderMapper.java +++ b/src/main/java/com/emr/dao/emrRoleReader/Emr_Role_ReaderMapper.java @@ -1,11 +1,12 @@ package com.emr.dao.emrRoleReader; +import com.emr.dao.CommomMapper; import com.emr.entity.emrRoleReader.Emr_Role_Reader; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface Emr_Role_ReaderMapper { +public interface Emr_Role_ReaderMapper extends CommomMapper { int deleteByPrimaryKey(Integer id); int insert(Emr_Role_Reader record); @@ -25,8 +26,4 @@ public interface Emr_Role_ReaderMapper { *角色id查询全部 * */ List selectAllByRoleId(@Param("roleId") Integer roleId); - /** - *批量插入 - * */ - int SimpleInsert(@Param("list") List list); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/emrUserReader/Emr_User_ReaderMapper.java b/src/main/java/com/emr/dao/emrUserReader/Emr_User_ReaderMapper.java index c7d0280..398bd54 100644 --- a/src/main/java/com/emr/dao/emrUserReader/Emr_User_ReaderMapper.java +++ b/src/main/java/com/emr/dao/emrUserReader/Emr_User_ReaderMapper.java @@ -1,11 +1,12 @@ package com.emr.dao.emrUserReader; +import com.emr.dao.CommomMapper; import com.emr.entity.emrUserReader.Emr_User_Reader; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface Emr_User_ReaderMapper { +public interface Emr_User_ReaderMapper extends CommomMapper { int deleteByPrimaryKey(Integer id); int insert(Emr_User_Reader record); @@ -22,8 +23,4 @@ public interface Emr_User_ReaderMapper { * 根据用户id删除 * */ void deleteReaderByUserId(@Param("userId") Integer userId); - /** - * 批量添加 - * */ - int SimpleInsert(@Param("list") List list); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/tTumour/TTumourChemotherapyMapper.java b/src/main/java/com/emr/dao/tTumour/TTumourChemotherapyMapper.java index d310c01..466f073 100644 --- a/src/main/java/com/emr/dao/tTumour/TTumourChemotherapyMapper.java +++ b/src/main/java/com/emr/dao/tTumour/TTumourChemotherapyMapper.java @@ -1,12 +1,13 @@ package com.emr.dao.tTumour; +import com.emr.dao.CommomMapper; import com.emr.entity.tTumour.TTumourChemotherapy; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface TTumourChemotherapyMapper { +public interface TTumourChemotherapyMapper extends CommomMapper { int insert(TTumourChemotherapy record); int insertSelective(TTumourChemotherapy record); @@ -14,6 +15,4 @@ public interface TTumourChemotherapyMapper { List selectByPatientId(@Param("patientId")String patientId); int deleteByPatientId(@Param("patientId")String patientId); - - int SimpleInsert(@Param("list")List list); } \ No newline at end of file diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index e2237c9..2eb5ed6 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -7,9 +7,11 @@ import com.emr.dao.emrPdfWaterSet.EmrPdfWaterSetMapper; import com.emr.entity.EmrComomSet; import com.emr.entity.Power_User; import com.emr.entity.ResultUtil; +import com.emr.entity.approve.Emr_Apply_Approve; import com.emr.entity.emrPdfWaterSet.EmrPdfWaterSet; import com.emr.entity.tScanAssort.T_Scan_Assort; import com.emr.service.tScanAssort.T_Scan_AssortService; +import com.emr.util.DateUtils; import com.emr.util.img2PdfUtil; import com.emr.vo.User; import com.emr.vo.commomSearch.CommomVo; @@ -19,6 +21,7 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -676,4 +679,30 @@ public class CommomService { } return loadingPerson; } + + /** + * 批量添加 + * @param tableName + * @param commomMapper + * @param operList + */ + public void simpleInsert(String tableName,CommomMapper commomMapper,List operList){ + if(!CollectionUtils.isEmpty(operList)) { + ///查询表列数 + int colCount = commomMapper.selectColByTableName(tableName); + List list = new ArrayList(); + int simpleInsertCount = 2100 / colCount; + for (int i = 0; i < operList.size(); i++) { + //处理批量添加sql太长问题，设定个数为180 + if (i > 0 && list.size() % simpleInsertCount == 0) { + list.clear(); + } + list.add(operList.get(i)); + //是180的倍数或最后一个 + if (list.size() % simpleInsertCount == 0 || i == operList.size() - 1) { + commomMapper.SimpleInsert(list); + } + } + } + } } diff --git a/src/main/java/com/emr/service/emrCode/DiagServiceImpl.java b/src/main/java/com/emr/service/emrCode/DiagServiceImpl.java index 669c5b5..46f72e0 100644 --- a/src/main/java/com/emr/service/emrCode/DiagServiceImpl.java +++ b/src/main/java/com/emr/service/emrCode/DiagServiceImpl.java @@ -5,6 +5,7 @@ import com.emr.dao.Emr_DictionaryMapper; import com.emr.dao.emrCode.T_DiagMapper; import com.emr.entity.Emr_Dictionary; import com.emr.entity.emrCode.T_Diag; +import com.emr.service.CommomService; import com.emr.vo.commomSearch.CommomVo; import com.lowagie.text.pdf.PdfStructureElement; import org.apache.commons.lang3.StringUtils; @@ -38,6 +39,8 @@ public class DiagServiceImpl implements DiagService { private Emr_DictionaryMapper dictionaryMapper; @Autowired private CommomMapper commomMapper; + @Autowired + private CommomService commomService; @Override public List selectAllByPatientId(String patientId, Short diagNo) { return diagMapper.selectAllByPatientId(patientId, diagNo); @@ -194,7 +197,7 @@ public class DiagServiceImpl implements DiagService { } //批量添加 if(!inserts.isEmpty()){ - diagMapper.SimpleInsert(inserts); + commomService.simpleInsert("t_diag",diagMapper,inserts); } //批量更新 if(!updates.isEmpty()){ diff --git a/src/main/java/com/emr/service/emrCode/OperateServiceImpl.java b/src/main/java/com/emr/service/emrCode/OperateServiceImpl.java index d80fe04..f1f78b6 100644 --- a/src/main/java/com/emr/service/emrCode/OperateServiceImpl.java +++ b/src/main/java/com/emr/service/emrCode/OperateServiceImpl.java @@ -3,6 +3,7 @@ package com.emr.service.emrCode; import com.emr.dao.emrCode.T_OperateMapper; import com.emr.entity.emrCode.T_Diag; import com.emr.entity.emrCode.T_Operate; +import com.emr.service.CommomService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,9 +28,11 @@ import java.util.List; */ @Service @Transactional -public class OperateServiceImpl implements OperateService { +public class OperateServiceImpl implements OperateService{ @Autowired private T_OperateMapper operateMapper; + @Autowired + private CommomService commomService; @Override public List selectAllByPatientId(String patientId,Short currentOperateNo) { return operateMapper.selectAllByPatientId(patientId,currentOperateNo); @@ -213,9 +216,7 @@ public class OperateServiceImpl implements OperateService { } } //批量添加 - if(!inserts.isEmpty()){ - operateMapper.SimpleInsert(inserts); - } + commomService.simpleInsert("t_operate",operateMapper,inserts); //批量更新 if(!updates.isEmpty()){ operateMapper.SimpleUpdate(updates); diff --git a/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java b/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java index 9af3e44..7762913 100644 --- a/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java +++ b/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java @@ -7,6 +7,7 @@ import com.emr.dao.emrPrintAndDownLoad.EmrPrintDownloadInfoMapper; import com.emr.entity.Power_User; import com.emr.entity.Zd_Assort; import com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo; +import com.emr.service.CommomService; import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo; import com.emr.vo.commomSearch.ScanPathVo; import org.apache.commons.lang3.StringUtils; @@ -31,6 +32,8 @@ public class PrintOrDownLoadInfoService { private EmrPrintDownloadInfoMapper printDownloadInfoMapper; @Autowired private Zd_AssortMapper assortMapper; + @Autowired + private CommomService commomService; /** * 批量插入 * */ @@ -86,7 +89,7 @@ public class PrintOrDownLoadInfoService { batchInsertList.add(obj); } //批量插入 - printDownloadInfoMapper.SimpleInsert(batchInsertList); + commomService.simpleInsert("emr_print_download_info",printDownloadInfoMapper,batchInsertList); } } diff --git a/src/main/java/com/emr/service/emrRoleReader/EmrRoleReaderServiceImpl.java b/src/main/java/com/emr/service/emrRoleReader/EmrRoleReaderServiceImpl.java index 2a8b185..ae3a4b7 100644 --- a/src/main/java/com/emr/service/emrRoleReader/EmrRoleReaderServiceImpl.java +++ b/src/main/java/com/emr/service/emrRoleReader/EmrRoleReaderServiceImpl.java @@ -3,6 +3,7 @@ package com.emr.service.emrRoleReader; import com.emr.dao.emrRoleReader.Emr_Role_ReaderMapper; import com.emr.entity.Power_User; import com.emr.entity.emrRoleReader.Emr_Role_Reader; +import com.emr.service.CommomService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +30,8 @@ import java.util.List; public class EmrRoleReaderServiceImpl implements EmrRoleRearderService{ @Autowired private Emr_Role_ReaderMapper roleReaderMapper; + @Autowired + private CommomService commomService; @Override public int insert(Emr_Role_Reader record, HttpServletRequest request) { Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); @@ -52,7 +55,7 @@ public class EmrRoleReaderServiceImpl implements EmrRoleRearderService{ } @Override - public int SimpleInsert(List list) { - return roleReaderMapper.SimpleInsert(list); + public void SimpleInsert(List list) { + commomService.simpleInsert("emr_role_reader",roleReaderMapper,list); } } diff --git a/src/main/java/com/emr/service/emrRoleReader/EmrRoleRearderService.java b/src/main/java/com/emr/service/emrRoleReader/EmrRoleRearderService.java index 09bd59b..f91f52e 100644 --- a/src/main/java/com/emr/service/emrRoleReader/EmrRoleRearderService.java +++ b/src/main/java/com/emr/service/emrRoleReader/EmrRoleRearderService.java @@ -12,5 +12,5 @@ public interface EmrRoleRearderService { List selectAllByRoleId(Integer roleId); - int SimpleInsert(List list); + void SimpleInsert(List list); } diff --git a/src/main/java/com/emr/service/emrUserReader/EmrUserReaderServiceImpl.java b/src/main/java/com/emr/service/emrUserReader/EmrUserReaderServiceImpl.java index ba376d6..99dc820 100644 --- a/src/main/java/com/emr/service/emrUserReader/EmrUserReaderServiceImpl.java +++ b/src/main/java/com/emr/service/emrUserReader/EmrUserReaderServiceImpl.java @@ -3,6 +3,7 @@ package com.emr.service.emrUserReader; import com.emr.dao.emrUserReader.Emr_User_ReaderMapper; import com.emr.entity.Power_User; import com.emr.entity.emrUserReader.Emr_User_Reader; +import com.emr.service.CommomService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +30,8 @@ import java.util.List; public class EmrUserReaderServiceImpl implements EmrUserRearderService { @Autowired private Emr_User_ReaderMapper userReaderMapper; + @Autowired + private CommomService commomService; @Override public int insert(Emr_User_Reader record, HttpServletRequest request) { Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); @@ -47,7 +50,7 @@ public class EmrUserReaderServiceImpl implements EmrUserRearderService { } @Override - public int SimpleInsert(List list) { - return userReaderMapper.SimpleInsert(list); + public void SimpleInsert(List list) { + commomService.simpleInsert("emr_user_reader",userReaderMapper,list); } } diff --git a/src/main/java/com/emr/service/emrUserReader/EmrUserRearderService.java b/src/main/java/com/emr/service/emrUserReader/EmrUserRearderService.java index 674436b..920543e 100644 --- a/src/main/java/com/emr/service/emrUserReader/EmrUserRearderService.java +++ b/src/main/java/com/emr/service/emrUserReader/EmrUserRearderService.java @@ -10,5 +10,5 @@ public interface EmrUserRearderService { void deleteReaderByUserId(Integer userId); - int SimpleInsert(List list); + void SimpleInsert(List list); } diff --git a/src/main/java/com/emr/service/tTumour/TTumourService.java b/src/main/java/com/emr/service/tTumour/TTumourService.java index b7cd315..ecdfa27 100644 --- a/src/main/java/com/emr/service/tTumour/TTumourService.java +++ b/src/main/java/com/emr/service/tTumour/TTumourService.java @@ -5,6 +5,7 @@ import com.emr.dao.tTumour.TTumourChemotherapyMapper; import com.emr.entity.Power_User; import com.emr.entity.tTumour.TTumour; import com.emr.entity.tTumour.TTumourChemotherapy; +import com.emr.service.CommomService; import com.emr.vo.commomSearch.CommomVo; import com.emr.vo.tTumourVo.TTumourVo; import org.apache.commons.lang3.StringUtils; @@ -38,6 +39,8 @@ public class TTumourService { private TTumourChemotherapyMapper tumourChemotherapyMapper; @Autowired private CommomMapper commomMapper; + @Autowired + private CommomService commomService; public void saveTumour(TTumourVo tumourVo, HttpServletRequest request){ String patientId = tumourVo.getPatientId(); CommomVo commomVo = new CommomVo(); @@ -83,7 +86,7 @@ public class TTumourService { } if(!list.isEmpty()){ - tumourChemotherapyMapper.SimpleInsert(list); + commomService.simpleInsert("t_tumour_chemotherapy",tumourChemotherapyMapper,list); } } } diff --git a/src/main/resources/mapper/commomSearch/ScanPathMapper.xml b/src/main/resources/mapper/commomSearch/ScanPathMapper.xml index 258c4f8..f4b6f37 100644 --- a/src/main/resources/mapper/commomSearch/ScanPathMapper.xml +++ b/src/main/resources/mapper/commomSearch/ScanPathMapper.xml @@ -65,7 +65,7 @@ ORDER BY - dbo.zd_assort.assort_sort + dbo.zd_assort.assort_sort,t_scan_assort.scan_page @@ -73,7 +73,7 @@ + --%> +
+
diff --git a/src/main/webapp/static/js/font/commomListSouth.js b/src/main/webapp/static/js/font/commomListSouth.js index 39b7bd8..f832e47 100644 --- a/src/main/webapp/static/js/font/commomListSouth.js +++ b/src/main/webapp/static/js/font/commomListSouth.js @@ -313,7 +313,6 @@ function getSql() { name = 'dis_date'; whereNames += commomtable + "." + name + " BETWEEN '" + $("#startTime2").val() + " 00:00:00' AND '" + $("#endTime2").val() + " 23:59:59' AND "; } - debugger //诊断名称 if ($("#diag_name").val() != '') { name = 'main_diag_name'; @@ -436,7 +435,7 @@ function getSql() { $("#sql").val(sql); $("#orderBys").val(orderBys); } - console.log(sql); + //console.log(sql); } else { $("#sql").val(""); } diff --git a/src/main/webapp/static/js/font/showRecordFont.js b/src/main/webapp/static/js/font/showRecordFont.js index 76d942d..d3389ff 100644 --- a/src/main/webapp/static/js/font/showRecordFont.js +++ b/src/main/webapp/static/js/font/showRecordFont.js @@ -6,7 +6,6 @@ var isIE = function(ver) { } //初始化函数 $(function(){ - debugger $('.contentDiv').css('height', '100%').css('height', '-=140px'); var ie = isIE(8); if(ie) { diff --git a/src/main/webapp/static/js/font/showRecordFontSouth.js b/src/main/webapp/static/js/font/showRecordFontSouth.js index e433753..db7aca7 100644 --- a/src/main/webapp/static/js/font/showRecordFontSouth.js +++ b/src/main/webapp/static/js/font/showRecordFontSouth.js @@ -8,10 +8,8 @@ var isIE = function(ver) { $(function(){ $('.contentDiv').css('height', '100%').css('height', '-=140px'); var ie = isIE(8); - debugger if(ie) { //ie8加载iframe - console.log("ssd"); $("#iframe").prop("src",path+"/font/showRecordIframeFontSouth?patientId="+$("#patientId").val()+"&flag=file_path"); }else{ //谷歌 diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js index 9371db6..192ad68 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js @@ -424,7 +424,6 @@ function getSql() { name = 'dis_date'; whereNames += commomtable + "." + name + " BETWEEN '" + $("#startTime2").val() + " 00:00:00' AND '" + $("#endTime2").val() + " 23:59:59' AND "; } - debugger //诊断名称 if ($("#diag_name").val() != '') { name = 'main_diag_name'; @@ -547,7 +546,7 @@ function getSql() { $("#sql").val(sql); $("#orderBys").val(orderBys); } - console.log(sql); + //console.log(sql); } else { $("#sql").val(""); } @@ -624,12 +623,7 @@ function exportExcel() { if (checks != '') { //按选择框选择导出 checks = checks.substring(0, checks.length - 1); - var isInputValue = getInputValue(); - if (isInputValue == '') { - sql += ' WHERE ' + commomtable + '.patient_id IN (' + checks + ')'; - } else { - sql += ' AND ' + commomtable + '.patient_id IN (' + checks + ')'; - } + sql += ' WHERE ' + commomtable + '.patient_id IN (' + checks + ')'; sql += orderBys; var url = path + "/template/exportExcel"; post(url, {"sql": sql, "tableThNames": tableThNames, "fieldCns": fieldCns}); diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js index a259461..96aff9e 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js @@ -297,7 +297,6 @@ function save(){ var assortId = $("#assortId").val(); if(assortId != ''){ if(file1.length > 0){ - debugger for (var i = 0; i < file1.length; i++) { formData.append('files', file1[i]); } diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js index f3e3365..b2a8005 100644 --- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js +++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js @@ -417,7 +417,6 @@ function getUpdateCommomInfo(patientId) { data:{patientId:patientId}, dataType:'json', success:function(data){ - console.log("data == " +data); if(null != data){ $("#patientId").val(data.patientId); $("#inpatientNo").val(data.inpatientNo); diff --git a/src/main/webapp/static/js/udpatePic/imgUp.js b/src/main/webapp/static/js/udpatePic/imgUp.js index 058d6eb..f62b56d 100644 --- a/src/main/webapp/static/js/udpatePic/imgUp.js +++ b/src/main/webapp/static/js/udpatePic/imgUp.js @@ -7,7 +7,6 @@ $(function(){ }; /*点击图片的文本框*/ $(".file").change(function(){ - debugger var idFile = $(this).attr("id"); var file = document.getElementById(idFile); var imgContainer = $(this).parents(".z_photo"); //存放图片的父亲元素 diff --git a/src/main/webapp/static/pdfjs/web/viewer1.js b/src/main/webapp/static/pdfjs/web/viewer1.js index 2e88536..9c53211 100644 --- a/src/main/webapp/static/pdfjs/web/viewer1.js +++ b/src/main/webapp/static/pdfjs/web/viewer1.js @@ -6861,7 +6861,6 @@ var PDFViewerApplication = { }, afterPrint: function pdfViewSetupAfterPrint() { - console.log(2) var div = document.getElementById('printContainer'); while (div.hasChildNodes()) { div.removeChild(div.lastChild);