From 8f48d717068a4d7fdb9dff5fb1818cb02ead1c63 Mon Sep 17 00:00:00 2001 From: ALW <850658129@qq.com> Date: Wed, 7 Sep 2022 08:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=87=87=E9=9B=86=E5=99=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E5=BC=80=E5=8F=91pasc=E9=87=87?= =?UTF-8?q?=E9=9B=86=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchiveOtherExtController.java | 3 + .../emr/controller/StatisticsController.java | 105 ++++++++++++ .../com/emr/dao/ArchiveOtherExtMapper.java | 14 ++ .../java/com/emr/dao/StatisticsMapper.java | 6 + .../com/emr/entity/Archive_Master_Vo.java | 4 + .../service/ipml/ArchiveOtherExtService.java | 31 +++- .../emr/service/ipml/ArchiveOtherService.java | 3 + .../ipml/Archive_MasterServiceImpl.java | 12 +- .../emr/service/ipml/StatisticsService.java | 29 ++++ .../java/com/emr/vo/ArchiveOtherExtVo.java | 6 + .../com/emr/vo/FinalAndFirstStatistics.java | 113 +++++++++++++ src/main/resources/config/config.properties | 2 + .../mapper/ArchiveOtherExtMapper.xml | 59 ++----- .../resources/mapper/StatisticsMapper.xml | 160 ++++++++++++------ .../views/beHospitaledDir/beHospList1.jsp | 4 +- .../views/statistics/acquisitionStatus.jsp | 118 +++++++++++++ .../WEB-INF/views/statistics/notCollected.jsp | 119 +++++++++++++ .../webapp/static/js/beHospList/beHospList.js | 9 +- .../static/js/beHospList/beHospList1.js | 9 +- .../js/hospitalCommom/hospitalCommom.js | 83 +++------ .../static/js/statistics/acquisitionStatus.js | 132 +++++++++++++++ .../static/js/statistics/notCollected.js | 108 ++++++++++++ 22 files changed, 961 insertions(+), 168 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/statistics/acquisitionStatus.jsp create mode 100644 src/main/webapp/WEB-INF/views/statistics/notCollected.jsp create mode 100644 src/main/webapp/static/js/statistics/acquisitionStatus.js create mode 100644 src/main/webapp/static/js/statistics/notCollected.js diff --git a/src/main/java/com/emr/controller/ArchiveOtherExtController.java b/src/main/java/com/emr/controller/ArchiveOtherExtController.java index 3787be6..7c5bcd2 100644 --- a/src/main/java/com/emr/controller/ArchiveOtherExtController.java +++ b/src/main/java/com/emr/controller/ArchiveOtherExtController.java @@ -1,5 +1,6 @@ package com.emr.controller; +import com.emr.dao.ArchiveOtherExtMapper; import com.emr.entity.ArchiveOther; import com.emr.entity.OffsetLimitPage; import com.emr.service.ipml.ArchiveOtherExtService; @@ -31,6 +32,8 @@ public class ArchiveOtherExtController { private ArchiveOtherExtService archiveOtherExtService; @Autowired private ArchiveOtherService archiveOtherService; + @Autowired + private ArchiveOtherExtMapper archiveOtherExtMapper; /** * 任务详情列表 * @param offset diff --git a/src/main/java/com/emr/controller/StatisticsController.java b/src/main/java/com/emr/controller/StatisticsController.java index 8442314..64f74bf 100644 --- a/src/main/java/com/emr/controller/StatisticsController.java +++ b/src/main/java/com/emr/controller/StatisticsController.java @@ -9,6 +9,7 @@ import com.emr.vo.*; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.PathVariable; @@ -36,6 +37,8 @@ import java.util.List; @Controller @RequestMapping("statistics/") public class StatisticsController { + @Value("${calculationTime}") + private String calculationTime; @Autowired private StatisticsService statisticsService; //终审按天统计 @@ -62,6 +65,19 @@ public class StatisticsController { return "statistics/statisticsDetail"; } + + //采集器明细 + @RequestMapping("acquisitionStatus") + public String acquisitionStatus(){ + return "statistics/acquisitionStatus"; + } + + //采集器未采集明细 + @RequestMapping("notCollected") + public String notCollected(){ + return "statistics/notCollected"; + } + //复印记录报表 @RequestMapping("printCount") public String printCount(){ @@ -107,6 +123,95 @@ public class StatisticsController { } } + + + + //采集器任务记录统计 + @RequestMapping("getCollectorTaskNum") + @ResponseBody + public OffsetLimitPage getCollectorTaskNum(Integer offset, Integer limit,FinalAndFirstStatistics finalAndFirstStatistics){ + //判断是否是初始化查询，是初始化查询把开始结束时间置空 + try { + List list = statisticsService.getCollectorTaskNum(offset, limit,finalAndFirstStatistics); + return new OffsetLimitPage((Page)list); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } + + + + + + + //导出采集器任务记录统计 + @RequestMapping("exportExcelCollectorTaskNum") + @ResponseBody + public void exportExcelCollectorTaskNum(HttpServletResponse response,Integer offset, Integer limit,FinalAndFirstStatistics finalAndFirstStatistics){ + //全部明细 + String tableThNames = "业务系统,产生日期,产生的数量,采集完成,相差数量,采错数量"; + String fieldCns = "sysFlagStr,produceDate,produceNum,completeNum,differ,errorNum"; + //判断是否是初始化查询，是初始化查询把开始结束时间置空 + try { + List list = statisticsService.getCollectorTaskNum(offset, limit,finalAndFirstStatistics); + //文件名 + String fileName = "采集器任务记录统计报表(" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + ").xls"; + //ExportExcelUtil + ExportExcelUtil1 exportExcelUtil = new ExportExcelUtil1(); + //导出excel的操作 + exportExcelUtil.expordExcel(tableThNames,fieldCns,list,fileName,response); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + } + } + + + + + //采集器未开始任务记录统计 + @RequestMapping("getNotStartedNum") + @ResponseBody + public OffsetLimitPage getNotStartedNum(Integer offset, Integer limit,FinalAndFirstStatistics finalAndFirstStatistics){ + finalAndFirstStatistics.setCalculationTime(calculationTime); + //判断是否是初始化查询，是初始化查询把开始结束时间置空 + try { + List list = statisticsService.getNotStartedNum(offset, limit,finalAndFirstStatistics); + return new OffsetLimitPage((Page)list); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + return null; + } + } + + + //导出采集器未开始任务记录统计 + @RequestMapping("exportExcelNotStartedNum") + @ResponseBody + public void exportExcelNotStartedNum(HttpServletResponse response,Integer offset, Integer limit,FinalAndFirstStatistics finalAndFirstStatistics){ + //全部明细 + finalAndFirstStatistics.setCalculationTime(calculationTime); + String tableThNames = "业务系统,任务剩余数量"; + String fieldCns = "sysFlagStr,notStarted"; + //判断是否是初始化查询，是初始化查询把开始结束时间置空 + try { + List list = statisticsService.getNotStartedNum(offset, limit,finalAndFirstStatistics); + //文件名 + String fileName = "采集器剩余任务统计报表(" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + ").xls"; + //ExportExcelUtil + ExportExcelUtil1 exportExcelUtil = new ExportExcelUtil1(); + //导出excel的操作 + exportExcelUtil.expordExcel(tableThNames,fieldCns,list,fileName,response); + } catch (Exception e) { + ExceptionPrintUtil.printException(e); + e.printStackTrace(); + } + } + + //初审按天统计 @RequestMapping("getFirstStatistics") @ResponseBody diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java index 700bdd5..f862b91 100644 --- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java +++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java @@ -88,4 +88,18 @@ public interface ArchiveOtherExtMapper { */ List selectEmrBackInfo(@Param("masterId") String masterId); + /** + * 查询护理C1字段是否有值 + * @param idTemp + * @return + */ + List selectEmrBackInfo1(@Param("idTemp") String idTemp); + + /** + * 查询护理C1字段是否有值 + * @param archiveOtherExtVo + * @return + */ + List selectEmrBackInfo2(ArchiveOtherExtVo archiveOtherExtVo); + } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/StatisticsMapper.java b/src/main/java/com/emr/dao/StatisticsMapper.java index df612c6..9d12ec2 100644 --- a/src/main/java/com/emr/dao/StatisticsMapper.java +++ b/src/main/java/com/emr/dao/StatisticsMapper.java @@ -7,9 +7,15 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface StatisticsMapper { + //终审按天统计 List finalStatistics(@Param("startDate")String startDate,@Param("endDate")String endDate,@Param("sql")String sql); + + //采集器任务详情 + List getCollectorTaskNum(FinalAndFirstStatistics finalAndFirstStatistics); + //采集器任务未开始详情 + List getNotStartedNum(FinalAndFirstStatistics finalAndFirstStatistics); //初审按天统计 List firstStatistics(@Param("startDate")String startDate,@Param("endDate")String endDate,@Param("sql")String sql); 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 3f61846..d3de46a 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -89,6 +89,10 @@ public class Archive_Master_Vo extends Archive_Master{ private String printStatus;//打印状态 private Integer isOverTime;//是否超期 + + private String hisStatic; + + private String patientId; } diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java index 34ef993..1b00a24 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java @@ -76,7 +76,7 @@ public class ArchiveOtherExtService { for (KeyValue keyValue : statusAndSysFlagValues) { if ("otherExtStatusFlag".equals(keyValue.getType())) { if (keyValue.getCode().equals(statusflag.toString())) { - vo.setStatusFlagStr(keyValue.getName()); + vo.setSysFlagStr(keyValue.getName()); break; } } @@ -97,6 +97,31 @@ public class ArchiveOtherExtService { } } } + + String idTemp = vo.getIdTemp(); + List archiveOtherExtVos = archiveOtherExtMapper.selectEmrBackInfo1(idTemp); + for (int i=0;archiveOtherExtVos.size()>i;i++){ + if (null != archiveOtherExtVos) { + if (!archiveOtherExtVos.get(i).getC1().equals("")) { + vo.setStatusFlagStr("完成"); + }else { + vo.setStatusFlagStr("未完成"); + } + } + } + if (vo.getSysflag().equals(1)) { + archiveOtherExtVo.setPid(vo.getJzh()); + List archiveOtherExtVos1 = archiveOtherExtMapper.selectEmrBackInfo2(archiveOtherExtVo); + if (null != archiveOtherExtVos1) { + for (int a = 0; archiveOtherExtVos1.size() > a; a++) { + if (!archiveOtherExtVos1.get(a).getC1().equals("")) { + vo.setStatusFlagStr("完成"); + } else { + vo.setStatusFlagStr("未完成"); + } + } + } + } } } return list; @@ -168,6 +193,10 @@ public class ArchiveOtherExtService { idsTemp = splitString2String(notNursingIds); } } +// if (null != sysFlag && sysFlag == 3){ +//// archiveOtherService.updateArchiveOtherExt(ids) +//// } + //ext表更新非护理记录 if(StringUtils.isNotBlank(notNursingIds)){ updateCommomSubmit(jzh, masterId,idsTemp); diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherService.java index ab089c5..fb9b7ca 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveOtherService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveOtherService.java @@ -59,6 +59,9 @@ public class ArchiveOtherService { archiveOtherMapper.insert(archiveOther); } } + public void updateArchiveOtherExt(String ids,String masterId,Integer sysFlag,Long extId) throws Exception{ + + } /** * 填充ArchiveOtherExt对象数据 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 f3cc8d9..b261539 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -295,6 +295,16 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { if(null != role) { for (Archive_Master_Vo masterVo : list) { String archivestate = masterVo.getArchivestate(); + String inpNo = masterVo.getPatientId(); +// String sql = "SELECT FISZH FROM V_JSWZH_EMR_CALLBACK WHERE JZH='"+inpNo+"'"; +// try { +// String select = OracleConnect.select(sql); +// masterVo.setHisStatic(select); +// String hisStatic = masterVo.getHisStatic(); +// } catch (Exception e) { +// ExceptionPrintUtil.printException(e); +// e.printStackTrace(); +// } if (StringUtils.isNotBlank(archivestate)) { //转换中文状态 boolean numeric = isNumeric(archivestate); @@ -1347,7 +1357,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { StringBuilder failResult = new StringBuilder(); //判断护理文书是否完成sysFlag = 1 //查询护理文书采集任务 - String sql1 = "SELECT SHOW_NAME,KDSJ FROM V_JSWZH_HL_DATA WHERE (ENABLED_VALUE = 'Y' OR ENABLED_VALUE IS NULL) AND SHOW_NAME != '护嘱单' AND JZH = '"+jzh+"'"; + String sql1 = "SELECT SHOW_NAME,KDSJ FROM V_JSWZH_HL_DATA WHERE (ENABLED_VALUE = 'Y' OR ENABLED_VALUE IS NULL) AND SHOW_NAME != '护嘱单' AND SHOW_NAME != '术前准备与手术交接记录单' AND JZH = '"+jzh+"'"; try { List selectList1 = OracleConnect.selectListConvertMap(sql1); if(!CollectionUtils.isEmpty(selectList1)) { diff --git a/src/main/java/com/emr/service/ipml/StatisticsService.java b/src/main/java/com/emr/service/ipml/StatisticsService.java index 3c721bd..1e81d8d 100644 --- a/src/main/java/com/emr/service/ipml/StatisticsService.java +++ b/src/main/java/com/emr/service/ipml/StatisticsService.java @@ -64,6 +64,35 @@ public class StatisticsService { return list; } + //采集器任务详情 + public List getCollectorTaskNum(Integer offset, Integer limit,FinalAndFirstStatistics finalAndFirstStatistics) throws Exception{ + if(null != offset && null != limit){ + PageHelper.offsetPage(offset, limit); + } + List list = statisticsMapper.getCollectorTaskNum(finalAndFirstStatistics); + for (int i=0;list.size()>i;i++){ + String produceNum = list.get(i).getProduceNum(); + int i1 = Integer.parseInt(produceNum); + String completeNum = list.get(i).getCompleteNum(); + int i2 = Integer.parseInt(completeNum); + int i3 = i1 - i2; + String differNum = String.valueOf(i3); + list.get(i).setDiffer(differNum); + } + //转换姓名 + return list; + } + + //采集器任务未开始详情 + public List getNotStartedNum(Integer offset, Integer limit,FinalAndFirstStatistics finalAndFirstStatistics) throws Exception{ + if(null != offset && null != limit){ + PageHelper.offsetPage(offset, limit); + } + List list = statisticsMapper.getNotStartedNum(finalAndFirstStatistics); + return list; + } + + //初审按天统计 public List getFirstStatistics(Integer offset, Integer limit, String startDate, String endDate,String sql) throws Exception{ diff --git a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java index 797bee0..fda7f3a 100644 --- a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java +++ b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java @@ -24,6 +24,8 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt { private String stimeStr; + private String sysFlag3; + private Integer timeStatus; private String etimeStr; @@ -38,6 +40,10 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt { private String assortId; + private String pid; + + private String jzh; + private String tempTime; private String nursingEndTime; diff --git a/src/main/java/com/emr/vo/FinalAndFirstStatistics.java b/src/main/java/com/emr/vo/FinalAndFirstStatistics.java index 0832f28..468b975 100644 --- a/src/main/java/com/emr/vo/FinalAndFirstStatistics.java +++ b/src/main/java/com/emr/vo/FinalAndFirstStatistics.java @@ -1,5 +1,7 @@ package com.emr.vo; +import java.util.Date; + /** * @ProjectName: * @Description: @@ -19,8 +21,119 @@ public class FinalAndFirstStatistics { private String createTime;//审核日期 + private String notStarted; + + + public String getCalculationTime() { + return calculationTime; + } + + public void setCalculationTime(String calculationTime) { + this.calculationTime = calculationTime; + } + + private String calculationTime; + + public String getNotStarted() { + return notStarted; + } + + public void setNotStarted(String notStarted) { + this.notStarted = notStarted; + } + + public String getErrorNum() { + return errorNum; + } + + public void setErrorNum(String errorNum) { + this.errorNum = errorNum; + } + + private String errorNum; + + public String getDiffer() { + return differ; + } + + public void setDiffer(String differ) { + this.differ = differ; + } + + private String sysflag; + + private String differ; + public String getSysflag() { + return sysflag; + } + + public void setSysflag(String sysflag) { + this.sysflag = sysflag; + } + private int count;//审核份数 + private String produceDate; + + private String produceNum; + + public String getProduceNum() { + return produceNum; + } + + public void setProduceNum(String produceNum) { + this.produceNum = produceNum; + } + + public String getCompleteNum() { + return completeNum; + } + + public void setCompleteNum(String completeNum) { + this.completeNum = completeNum; + } + + public String getSysFlagStr() { + return sysFlagStr; + } + + public void setSysFlagStr(String sysFlagStr) { + this.sysFlagStr = sysFlagStr; + } + + public String getProduceDate() { + return produceDate; + } + + public void setProduceDate(String produceDate) { + this.produceDate = produceDate; + } + + private String completeNum; + + + private String sysFlagStr; + + private String startDate; + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + private String endDate; + public String getCheckCode() { return checkCode; } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 283cf5a..57222d9 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -67,3 +67,5 @@ oraclePassWord = Jswzh #oracleUserName = docus #oraclePassWord = docus702 +calculationTime= 2022/08/01 + diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml index fa3e218..47207d9 100644 --- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml +++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml @@ -10,6 +10,7 @@ + @@ -318,9 +319,9 @@ MID = #{mid,jdbcType=NVARCHAR}, - - DID = #{did,jdbcType=NVARCHAR}, - + + + C1 = #{c1,jdbcType=NVARCHAR}, @@ -395,7 +396,7 @@ statusFlag = #{statusflag,jdbcType=INTEGER}, pResult = #{presult,jdbcType=NVARCHAR}, MID = #{mid,jdbcType=NVARCHAR}, - DID = #{did,jdbcType=NVARCHAR}, +-- DID = #{did,jdbcType=NVARCHAR}, C1 = #{c1,jdbcType=NVARCHAR}, C2 = #{c2,jdbcType=NVARCHAR}, C3 = #{c3,jdbcType=NVARCHAR}, @@ -583,47 +584,7 @@ + + + diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml index a4ac3d7..fb3f712 100644 --- a/src/main/resources/mapper/StatisticsMapper.xml +++ b/src/main/resources/mapper/StatisticsMapper.xml @@ -129,61 +129,109 @@ ORDER BY discharge_date_time desc - + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp index cb904a7..28e264f 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList1.jsp @@ -193,9 +193,9 @@
+ maxlength="10" autocomplete="off"/> - - +
diff --git a/src/main/webapp/WEB-INF/views/statistics/acquisitionStatus.jsp b/src/main/webapp/WEB-INF/views/statistics/acquisitionStatus.jsp new file mode 100644 index 0000000..577a223 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/statistics/acquisitionStatus.jsp @@ -0,0 +1,118 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + 采集器任务记录统计报表 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + + + + + +
+
+
+
+ + 采集器任务记录统计报表 + +
+
+
+ +
+
+
+ +
+ + - + +
+
+
+ + +
+ + +
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/statistics/notCollected.jsp b/src/main/webapp/WEB-INF/views/statistics/notCollected.jsp new file mode 100644 index 0000000..b05c14a --- /dev/null +++ b/src/main/webapp/WEB-INF/views/statistics/notCollected.jsp @@ -0,0 +1,119 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + 采集器未采集任务统计报表 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + + + + + +
+
+
+
+ + 采集器未采集任务统计报表 + +
+
+
+ +
+
+ <%--
--%> + <%----%> + <%--
--%> + <%-- + <%--style="text-align: center" maxlength="10" autocomplete="off"/>--%> + <%-----%> + <%-- + <%--maxlength="10" style="text-align: center" autocomplete="off"/>--%> + <%--
--%> + <%--
--%> +
+ + +
+ + +
+
+ +
+
+
+
+ +
+ +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index 37dfdea..e425571 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -152,14 +152,15 @@ function initTable() { }, { title: 'HIS召回状态', - field: 'callBackStatus', + field: 'hisStatic', align: 'center', valign: 'middle', formatter:function(value, row){ - if(value != '否'){ - return ''+value+''; + var hisStatic = row.hisStatic; + if(hisStatic == '已召回'){ + return ''+hisStatic+''; }else{ - return '未召回'; + return '否'; } } }, diff --git a/src/main/webapp/static/js/beHospList/beHospList1.js b/src/main/webapp/static/js/beHospList/beHospList1.js index 80d2faf..f6fb62e 100644 --- a/src/main/webapp/static/js/beHospList/beHospList1.js +++ b/src/main/webapp/static/js/beHospList/beHospList1.js @@ -152,14 +152,15 @@ function initTable() { }, { title: 'HIS召回状态', - field: 'callBackStatus', + field: 'hisStatic', align: 'center', valign: 'middle', formatter:function(value, row){ - if(value == '召回中'){ - return '召回中'; + var hisStatic = row.hisStatic; + if(hisStatic == '已召回'){ + return ''+hisStatic+''; }else{ - return '未召回'; + return '否'; } } }, diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index 87f8d6b..60fcdf6 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -1219,24 +1219,12 @@ function initTable5(data,sidePagination) { align: 'center', hidden: true, formatter: function (value, row, index) { - // let nursingEndTime = row.nursingEndTime; - // let time = row.createTime; - // let etimeStr = row.etimeStr; - // if(row.sysflag == 1){ - // if (time==null || nursingEndTime > time || nursingEndTime == null) { - // return { disabled : false} - // }else { - // return { disabled : true,} - // } - // }else{ - // if (time==null || etimeStr > time || etimeStr == null) { - // return { disabled : false,} - // }else { - // return { disabled : true,} - // } - // } let statusFlagStr = row.statusFlagStr; - if (statusFlagStr=="正采" ||statusFlagStr=="未开始"){ + if (statusFlagStr=="未完成" ||statusFlagStr==""){ + return { disabled : true} + } + let sysFlagStr=row.sysFlagStr + if (sysFlagStr=='Pacs检查'){ return { disabled : true} } }, @@ -1247,33 +1235,18 @@ function initTable5(data,sidePagination) { valign: 'middle', width: 120, // 定义列的宽度，单位为像素px formatter: function (value, row, index) { - // let nursingEndTime = row.nursingEndTime; - // // let time = row.createTime; - // // let etimeStr = row.etimeStr; - // // //1是护理 - // // if(row.sysflag == 1){ - // // if ( time=='' ||time==null || nursingEndTime > time && nursingEndTime != null ){ - // // var html = ''; - // // return html; - // // } else if ( nursingEndTime != null && nursingEndTime < time && time !=null && time !=''){ - // // var html = ''; - // // return html; - // // } - // // }else{ - // // if ( time=='' ||time==null || etimeStr > time && etimeStr != null){ - // // var html = ''; - // // return html; - // // } else if ( etimeStr != null && etimeStr < time && time !=null && time !=''){ - // // var html = ''; - // // return html; - // // } - // // } let statusFlagStr = row.statusFlagStr; - if (statusFlagStr=="正采" ||statusFlagStr=="未开始"){ - var html = ''; - return html; + let sysFlagStr=row.sysFlagStr + if (sysFlagStr!='Pacs检查'){ + if (statusFlagStr=="未完成" ||statusFlagStr==""){ + var html = ''; + return html; + }else { + var html = ''; + return html; + } }else { - var html = ''; + var html = ''; return html; } }, @@ -1345,17 +1318,17 @@ function initTable5(data,sidePagination) { field: 'statusFlagStr', align: 'center', valign: 'middle', - formatter: function (value, row, index) { - if(value != null){ - var color = ''; - if(row.statusflag == 0){ - color = selectTimeColor(row.tempTime,row.etimeStr); - } - return ''+value+''; - }else{ - return value; - } - } + // formatter: function (value, row, index) { + // if(value != null){ + // var color = ''; + // if(row.statusflag == 0){ + // color = selectTimeColor(row.tempTime,row.etimeStr); + // } + // return ''+value+''; + // }else{ + // return value; + // } + // } }, { title: '分段', @@ -1422,7 +1395,7 @@ function initTable5(data,sidePagination) { */ function selectTimeColor(value,row){ let statusFlagStr = row.statusFlagStr; - if (statusFlagStr=="正采" ||statusFlagStr=="未开始"){ + if (statusFlagStr=="未完成" ||statusFlagStr==""){ color = 'red'; }else { color = 'green'; @@ -1431,7 +1404,7 @@ function selectTimeColor(value,row){ } function selectTimeColor2(value,row){ let statusFlagStr = row.statusFlagStr; - if (statusFlagStr=="正采" ||statusFlagStr=="未开始"){ + if (statusFlagStr=="未完成" ||statusFlagStr==""){ color = 'red'; }else { color = 'green'; diff --git a/src/main/webapp/static/js/statistics/acquisitionStatus.js b/src/main/webapp/static/js/statistics/acquisitionStatus.js new file mode 100644 index 0000000..d06590b --- /dev/null +++ b/src/main/webapp/static/js/statistics/acquisitionStatus.js @@ -0,0 +1,132 @@ +var tipLoad = 1; +//定义表格内容最大高度 +var maxHeight = 0; +function initTable() { + if(tipLoad == 1){ + $("#table").bootstrapTable({ // 对应table标签的id + url: path+"/statistics/getCollectorTaskNum", // 获取表格数据的url + contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 + cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true + striped: true, //表格显示条纹，默认为false + pagination: true, // 在表格底部显示分页组件，默认false + paginationShowPageGo: true, + pageList: [5,10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 + sidePagination: 'server', // 设置为服务器端分页 客户端：client + search: false, + showColumns: true, + toolbar: '#toolbar',//指定工具栏 + searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法 + undefinedText: '--', //当数据为 undefined 时显示的字符 + singleSelect: false,//设置True 将禁止多选 + clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox + //height: getStaticTableHeight(), //定义表格的高度。 + searchTimeOut: 500,// 默认500 设置搜索超时时间。 + toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' + paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 + showHeader: true,//是否显示列头。 + trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。 + //是否显示导出按钮 + showExport: true, + //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据） + exportDataType: "basic", + //导出文件类型 + exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'], + exportOptions: { + fileName: document.title + }, + queryParams: function (params) { + var currPageSize = this.pageSize; + if (currPageSize == 2) { + currPageSize = 10; + } + var limit = null; + var offset = params.offset; + //判断是否导出全部all + if ($("#sel_exportoption").val() == "all") { + offset = 0; + limit = this.totalRows; + this.pageSize = limit; + } else { + limit = currPageSize; + this.pageSize = currPageSize; + } + var temp = { + limit: limit, //页面大小 + offset: offset, //页码 + startDate: $("#startTime1").val(), + endDate: $("#endTime1").val(), + isSearch:$("#isSearch").val(), + sysflag:$("#sysflag").val() + }; + return temp; + }, + columns: [{ + title: '全选', + field: 'select', //复选框 + checkbox: true, + width: 25, + align: 'center', + valign: 'middle', + }, + { + title: '业务系统', + field: 'sysFlagStr', + align: 'center', + valign: 'middle', + }, + { + title: '产生日期', + field: 'produceDate', + align: 'center', + valign: 'middle', + }, + { + title: '产生的数量', + field: 'produceNum', + align: 'center', + valign: 'middle', + }, + { + title: '采集完成', + field: 'completeNum', + align: 'center', + valign: 'middle', + }, + { + title: '相差数量', + field: 'differ', + align: 'center', + valign: 'middle', + }, + { + title: '采错数量', + field: 'errorNum', + align: 'center', + valign: 'middle', + } + + ], + onLoadSuccess: function (result) { //加载成功时执行 + $(".page-list").show(); + tipLoad =0; + reloadTableHeight("table"); + }, + onLoadError: function () { //加载失败时执行 + tipLoad = 0; + } + + }); + } +} + +//导出excel功能 +$("#excelBtn").click(function () { + //获取选中数据记录 + var url = path+"/statistics/exportExcelCollectorTaskNum"; + post(url, { + "startDate": $("#startTime1").val(), + "endDate": $("#endTime1").val(), + "isSearch":$("#isSearch").val(), + "sysflag":$("#sysflag").val() + }); +}); \ No newline at end of file diff --git a/src/main/webapp/static/js/statistics/notCollected.js b/src/main/webapp/static/js/statistics/notCollected.js new file mode 100644 index 0000000..26925ac --- /dev/null +++ b/src/main/webapp/static/js/statistics/notCollected.js @@ -0,0 +1,108 @@ +var tipLoad = 1; +//定义表格内容最大高度 +var maxHeight = 0; +function initTable() { + if(tipLoad == 1){ + $("#table").bootstrapTable({ // 对应table标签的id + url: path+"/statistics/getNotStartedNum", // 获取表格数据的url + contentType: "application/x-www-form-urlencoded",//一种编码。好像在post请求的时候需要用到。这里用的get请求，注释掉这句话也能拿到数据 + cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true + striped: true, //表格显示条纹，默认为false + pagination: true, // 在表格底部显示分页组件，默认false + paginationShowPageGo: true, + pageList: [5,10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。 + sidePagination: 'server', // 设置为服务器端分页 客户端：client + search: false, + showColumns: true, + toolbar: '#toolbar',//指定工具栏 + searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法 + undefinedText: '--', //当数据为 undefined 时显示的字符 + singleSelect: false,//设置True 将禁止多选 + clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox + //height: getStaticTableHeight(), //定义表格的高度。 + searchTimeOut: 500,// 默认500 设置搜索超时时间。 + toolbarAlign: 'right',// 指定 toolbar 水平方向的位置。'left' 或 'right' + paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。 + showHeader: true,//是否显示列头。 + trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。 + //是否显示导出按钮 + showExport: true, + //导出表格方式（默认basic：只导出当前页的表格数据；all：导出所有数据；selected：导出选中的数据） + exportDataType: "basic", + //导出文件类型 + exportTypes: ['json', 'xml', 'csv', 'txt', 'sql', 'excel'], + exportOptions: { + fileName: document.title + }, + queryParams: function (params) { + var currPageSize = this.pageSize; + if (currPageSize == 2) { + currPageSize = 10; + } + var limit = null; + var offset = params.offset; + //判断是否导出全部all + if ($("#sel_exportoption").val() == "all") { + offset = 0; + limit = this.totalRows; + this.pageSize = limit; + } else { + limit = currPageSize; + this.pageSize = currPageSize; + } + var temp = { + limit: limit, //页面大小 + offset: offset, //页码 + startDate: $("#startTime1").val(), + endDate: $("#endTime1").val(), + isSearch:$("#isSearch").val(), + sysflag:$("#sysflag").val() + }; + return temp; + }, + columns: [{ + title: '全选', + field: 'select', //复选框 + checkbox: true, + width: 25, + align: 'center', + valign: 'middle', + }, + { + title: '业务系统', + field: 'sysFlagStr', + align: 'center', + valign: 'middle', + }, + { + title: '任务剩余数量', + field: 'notStarted', + align: 'center', + valign: 'middle', + } + + ], + onLoadSuccess: function (result) { //加载成功时执行 + $(".page-list").show(); + tipLoad =0; + reloadTableHeight("table"); + }, + onLoadError: function () { //加载失败时执行 + tipLoad = 0; + } + + }); + } +} + +//导出excel功能 +$("#excelBtn").click(function () { + //获取选中数据记录 + var url = path+"/statistics/exportExcelNotStartedNum"; + post(url, { + "startDate": $("#startTime1").val(), + "endDate": $("#endTime1").val(), + "isSearch":$("#isSearch").val(), + "sysflag":$("#sysflag").val() + }); +}); \ No newline at end of file