diff --git a/src/main/java/com/emr/controller/DictionaryController.java b/src/main/java/com/emr/controller/DictionaryController.java index b6d99b4..0dd2065 100644 --- a/src/main/java/com/emr/controller/DictionaryController.java +++ b/src/main/java/com/emr/controller/DictionaryController.java @@ -6,6 +6,8 @@ */ package com.emr.controller; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.emr.entity.Emr_Dictionary; import com.emr.entity.Power_User; import com.emr.service.Emr_DictionaryService; @@ -16,6 +18,7 @@ import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; @@ -45,6 +48,12 @@ public class DictionaryController { return null; } } + @ResponseBody + @RequestMapping(value = "/saveZtree") + public int saveZtree(String initZNodes){ + List emrDictionaries = JSONArray.parseArray(initZNodes, Emr_Dictionary.class); + return emrDictionaryService.saveZtree(emrDictionaries); + } @ResponseBody @RequestMapping(value = "/delById") diff --git a/src/main/java/com/emr/controller/VCountController.java b/src/main/java/com/emr/controller/VCountController.java index 9fc10b2..99cdca2 100644 --- a/src/main/java/com/emr/controller/VCountController.java +++ b/src/main/java/com/emr/controller/VCountController.java @@ -77,8 +77,8 @@ public class VCountController { @ResponseBody @RequestMapping(value = "/exportExcel") public void exportExcel(HttpServletResponse response, V_CountVo vCount){ - String tableThNames = "科室代码,科室名称,出院人数,已归档,未归档,死亡人数,归档率(%),2日率(%),3日率(%),7日率(%)"; - String fieldCns = "deptCode,deptName,outNum,fileNum,unfileNum,deathNum,fileRate,day2Rate,day3Rate,day7Rate"; + String tableThNames = "科室代码,科室名称,出院人数,已归档,未归档,死亡人数,归档率(%),2日率(%),3日率(%)"; + String fieldCns = "deptCode,deptName,outNum,fileNum,unfileNum,deathNum,fileRate,day3Rate,day2Rate"; //构造excel的数据 try { List list = v_countService.selectByCol(vCount); @@ -87,11 +87,9 @@ public class VCountController { Double fileRate = Double.valueOf(count.getFileRate())*100; Double day2Rate = Double.valueOf(count.getDay2Rate())*100; Double day3Rate = Double.valueOf(count.getDay3Rate())*100; - Double day7Rate = Double.valueOf(count.getDay7Rate())*100; count.setFileRate(fileRate.intValue()+"%"); count.setDay2Rate(day2Rate.intValue()+"%"); count.setDay3Rate(day3Rate.intValue()+"%"); - count.setDay7Rate(day7Rate.intValue()+"%"); } } //文件名 diff --git a/src/main/java/com/emr/dao/Emr_DictionaryMapper.java b/src/main/java/com/emr/dao/Emr_DictionaryMapper.java index 51d68c4..98bdfda 100644 --- a/src/main/java/com/emr/dao/Emr_DictionaryMapper.java +++ b/src/main/java/com/emr/dao/Emr_DictionaryMapper.java @@ -27,6 +27,9 @@ public interface Emr_DictionaryMapper { */ int insertSel(Emr_Dictionary emrDictionary); + + int saveZtree(@Param("list")List list); + /** * 根据id删除记录 * @param id diff --git a/src/main/java/com/emr/entity/Emr_Dictionary.java b/src/main/java/com/emr/entity/Emr_Dictionary.java index 9572f1b..bc53795 100644 --- a/src/main/java/com/emr/entity/Emr_Dictionary.java +++ b/src/main/java/com/emr/entity/Emr_Dictionary.java @@ -7,12 +7,22 @@ public class Emr_Dictionary { private String typename; + public String getSort() { + return sort; + } + + public void setSort(String sort) { + this.sort = sort; + } + private String code; private String name; private String pyCode; + private String sort; + private String wbCode; private String zipCode; diff --git a/src/main/java/com/emr/service/Emr_DictionaryService.java b/src/main/java/com/emr/service/Emr_DictionaryService.java index 9f5e0c1..f833ab6 100644 --- a/src/main/java/com/emr/service/Emr_DictionaryService.java +++ b/src/main/java/com/emr/service/Emr_DictionaryService.java @@ -20,7 +20,12 @@ public interface Emr_DictionaryService { * @return */ List dicByClo(Emr_Dictionary emrDictionary); - + /** + * @description: 保存字典数拖拽 + * @author linjj + * @date: 2023/8/25 15:53 + */ + int saveZtree(List emrDictionaries); /** * 根据字段查找记录 * diff --git a/src/main/java/com/emr/service/ipml/Emr_DictionaryServiceImpl.java b/src/main/java/com/emr/service/ipml/Emr_DictionaryServiceImpl.java index d658046..e0440a7 100644 --- a/src/main/java/com/emr/service/ipml/Emr_DictionaryServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Emr_DictionaryServiceImpl.java @@ -29,6 +29,11 @@ public class Emr_DictionaryServiceImpl implements Emr_DictionaryService { return emrDictionaryMapper.dicByClo(emrDictionary); } + @Override + public int saveZtree(List emrDictionaries) { + return emrDictionaryMapper.saveZtree(emrDictionaries); + } + @Override public int insertSel(Emr_Dictionary emrDictionary) { return emrDictionaryMapper.insertSel(emrDictionary); diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 283cf5a..cb293a8 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -2,7 +2,7 @@ #POWER_IP = localhost #POWER_PORT = 8081 -POWER_IP = 200.100.104.40 +POWER_IP = localhost POWER_PORT = 8081 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 @@ -24,7 +24,7 @@ complete_port = ${POWER_PORT} requestCompleteUrl = http://${complete_ip}:${complete_port}/completeInfo/getCompleteInfoByMasterId/ CHECKSUCCESS_PORT = ${POWER_PORT} -HomepageDictionary=http://${CHECKSUCCESS_IP}:${CHECKSUCCESS_PORT}/WholeCheckInterface/services/HomepageDictionary?wsdl +HomepageDictionary=http://${CHECKSUCCESS_IP}:8081/WholeCheckInterface/services/HomepageDictionary?wsdl HomepageMethod=CheckData #webSocket\u670D\u52A1\u5668\u5730\u5740 @@ -39,7 +39,7 @@ STR_SPLIT = *^:|,. recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 #pdf\u6C34\u5370 -pdfWater = \u4F5B\u5C71\u5E02\u9AD8\u660E\u4EBA\u6C11\u533B\u9662&\u62CD\u7167\u65E0\u6548,\u9700\u8981\u590D\u5370\u8BF7\u627E\u75C5\u6848\u5BA4 +pdfWater = \u6F6E\u5DDE\u5E02\u4EBA\u6C11\u533B\u9662 #\u672C\u5730\u56FE\u7247\u5730\u5740 pictureUrl=D:\\JiaShiPic\\ @@ -50,20 +50,10 @@ picSrc=upload\\ #\u5B9A\u4E49\u7B2C\u4E09\u65B9\u6D4F\u89C8\u75C5\u5386\u7684\u67E5\u8BE2\u5168\u90E8\u5206\u7C7B\u7684\u5206\u7C7Bid\u53C2\u6570\u503C allAddortIds = 00000000 +notJudgeTasks = \u77E5\u60C5\u540C\u610F\u4E66 + #\u7528\u4E8E\u8D85\u671F\u901A\u77E5\uFF0C\u53EA\u901A\u77E5\u8BE5\u65E5\u671F\u4EE5\u540E\u7684\u51FA\u9662\u8D85\u671F\u7684\u8BB0\u5F55 overDateSet = 2021-05-01 #\u5404\u5BA1\u6838\u89D2\u8272\u7528\u6237id 1\uFF1A\u533B\u751F\uFF1B2\uFF1A\u62A4\u58EB\uFF1B3\uFF1A\u75C5\u6848\u5BA4\u4EBA\u5458\uFF1B5\uFF1A\u533B\u751F\u8D28\u63A7\u5458\uFF1B6\uFF1A\u79D1\u4E3B\u4EFB\uFF1B7\uFF1A\u62A4\u58EB\u957F\uFF1B8\uFF1A\u62A4\u58EB\u8D28\u63A7\u5458 -#\u79D1\u4E3B\u4EFB\u548C\u62A4\u58EB\u957F\u5BA1\u6838\u65F6\u9700\u8981\u8FC7\u6EE4\u6821\u9A8C\u7684\u4EFB\u52A1\u6587\u4EF6\u540D\u79F0\u96C6\u5408 -notJudgeTasks = \u77E5\u60C5\u540C\u610F\u4E66 - -#\u7B2C\u4E09\u65B9oracle\u914D\u7F6E\u4FE1\u606F -oracleUrl = 200.100.100.1:1521/orc1 -oracleUserName = Jswzh -oraclePassWord = Jswzh - -#oracleUrl = 127.0.0.1:1521/ORCL -#oracleUserName = docus -#oraclePassWord = docus702 - diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 5617e73..49f8c6a 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,16 +1,16 @@ #\u6570\u636E\u5E93IP -#dataBaseIp=localhost -##\u6570\u636E\u5E93\u540D\u79F0 -#dataBaseName=gm_record -##\u6570\u636E\u5E93\u5BC6\u7801 -#dataBasePassword=docus702 - -#\u6570\u636E\u5E93IP -dataBaseIp=200.100.104.40 +dataBaseIp=localhost #\u6570\u636E\u5E93\u540D\u79F0 -dataBaseName=emr_record +dataBaseName=gm_record #\u6570\u636E\u5E93\u5BC6\u7801 -dataBasePassword=AbcXyz123 +dataBasePassword=admin123 + +#\u6570\u636E\u5E93IP +#dataBaseIp=200.100.104.40 +##\u6570\u636E\u5E93\u540D\u79F0 +#dataBaseName=emr_record +##\u6570\u636E\u5E93\u5BC6\u7801 +#dataBasePassword=AbcXyz123 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName} diff --git a/src/main/resources/mapper/Emr_DictionaryMapper.xml b/src/main/resources/mapper/Emr_DictionaryMapper.xml index 5d3e3be..ed5564a 100644 --- a/src/main/resources/mapper/Emr_DictionaryMapper.xml +++ b/src/main/resources/mapper/Emr_DictionaryMapper.xml @@ -20,6 +20,7 @@ + id,typeCode,typeName,code,name,py_code,wb_code,zip_code,gb_code,flag,c_comment,parent_id,effective, creater, create_time, updater, @@ -107,6 +108,7 @@ emr_dictionary.gb_code, emr_dictionary.flag, emr_dictionary.c_comment, + emr_dictionary.sort, CASE WHEN emr_dictionary.parent_id = '0' THEN emr_dictionary.parent_id @@ -158,7 +160,7 @@ and emr_dictionary.effective = #{effective,jdbcType=INTEGER} - ORDER BY emr_dictionary.parent_id + ORDER BY emr_dictionary.sort                --%> - <%--<%–                –%>--%> - <%--<%––%>--%> - <%----%> - <%----%> - <%--
--%> - <%----%> - <%----%> +
+
+ +
+ +
+
+
+
@@ -244,9 +241,8 @@
- -                
@@ -293,6 +289,7 @@
diff --git a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary2.jsp b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary2.jsp new file mode 100644 index 0000000..5fd3480 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary2.jsp @@ -0,0 +1,1045 @@ +<%@ 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" %> + <%@ include file="../../jspf/ztreeCommom.jsp" %> + + + + +
+
+
+
+
+

字典列表

+
+
+
+ + +
+
+ + +
+
+ +
+
+
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +

    字典信息

    +
    +
    +
    + + <%----%> +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + + <%--
    --%> + <%--
    --%> + <%----%> + <%--
    --%> + <%----%> + <%--
    --%> + <%--
    --%> + <%--
    --%> + <%--
    --%> +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    + <%----%> +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/src/main/webapp/static/js/vCount/vCountList.js b/src/main/webapp/static/js/vCount/vCountList.js index ad7a0e7..708a29e 100644 --- a/src/main/webapp/static/js/vCount/vCountList.js +++ b/src/main/webapp/static/js/vCount/vCountList.js @@ -520,55 +520,7 @@ $(function () { {type: 'average', name: '平均值'} ] } - } - , - { - name: '5日归档率%', - type: 'line', - min: 10, - max: 100, - data: day7Arr, - lineStyle: { - normal: { - width: 5, - color: { - type: 'linear', - - colorStops: [{ - offset: 0, - color: '#06D06F' // 0% 处的颜色 - }, - { - offset: 0.4, - color: '#06D06F' // 100% 处的颜色 - }, { - offset: 1, - color: '#06D06F' // 100% 处的颜色 - } - ], - globalCoord: false // 缺省为 false - }, - shadowColor: 'rgba(249,165,137, 0.5)', - shadowBlur: 10, - shadowOffsetY: 7 - } - }, - itemStyle: { - normal: { - color: '#06D06F', - borderWidth: 10, - /*shadowColor: 'rgba(72,216,191, 0.3)', - shadowBlur: 100,*/ - borderColor: "#F6D06F" - } - }, - smooth: true, - markLine: { - data: [ - {type: 'average', name: '平均值'} - ] - } - } + }, ] }; } @@ -680,12 +632,6 @@ function initTable() { align: 'left', valign: 'middle', }, - // { - // title: '在院人数', - // field: 'inNum', - // align: 'center', - // valign: 'middle', - // }, { title: '出院人数', field: 'outNum', @@ -723,21 +669,9 @@ function initTable() { return val; } }, + { title: '2日归档率%', - field: 'day2Rate', - align: 'center', - valign: 'middle', - formatter: function (value, row, index) { - var val; - if (row.day2Rate != null && row.day2Rate != '') { - val = Math.round(row.day2Rate * 100) + "%"; - } - return val; - } - }, - { - title: '3日归档率%', field: 'day3Rate', align: 'center', valign: 'middle', @@ -750,18 +684,31 @@ function initTable() { } }, { - title: '5日归档率%', - field: 'day7Rate', + title: '3日归档率%', + field: 'day2Rate', align: 'center', valign: 'middle', formatter: function (value, row, index) { var val; - if (row.day7Rate != null && row.day7Rate != '') { - val = Math.round(row.day7Rate * 100) + "%"; + if (row.day2Rate != null && row.day2Rate != '') { + val = Math.round(row.day2Rate * 100) + "%"; } return val; } - } + }, + // { + // title: '5日归档率%', + // field: 'day7Rate', + // align: 'center', + // valign: 'middle', + // formatter: function (value, row, index) { + // var val; + // if (row.day7Rate != null && row.day7Rate != '') { + // val = Math.round(row.day7Rate * 100) + "%"; + // } + // return val; + // } + // } ], onLoadSuccess: function (result) { //加载成功时执行 $(".page-list").show();