Bläddra i källkod
Squashed commit of the following:
commit 43a98a997d4e9d7b6e7823867bcf6a63989edac4
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 11 10:27:45 2019 +0800
量表状态提升调整
commit 6d57e548527ae0a4cf6796c918c80d6deee90d82
Author: liucf <liucf@zjlantone.com>
Date: Mon Jun 10 16:36:53 2019 +0800
Squashed commit of the following:
commit 9063255eb75c457b9f004e1ff8371ab608dfbc32
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:20:10 2019 +0800
非计算量表处理
commit ddf0d1d8ce1c45d6dfbf832ae533e8d4e4b74883
Merge: 9a1fbfc 8f53d2e
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:41:45 2019 +0800
Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 9a1fbfcf878a9d4e0be765709698cfcbbf1c2e4f
Author: liucf <liucf@zjlantone.com>
Date: Mon May 27 14:56:34 2019 +0800
输入框类型
commit 5efe765adbfec33b879d94869577b6830705f2bb
Merge: a4a73f1 fed7711
Author: liucf <liucf@zjlantone.com>
Date: Mon May 27 14:21:00 2019 +0800
Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag
commit a4a73f15a076d6ab62ebcdc1339fa79625bd77f7
Author: liucf <liucf@zjlantone.com>
Date: Mon May 27 14:12:52 2019 +0800
输入框类型调整-未完成
# Conflicts:
# src/components/ChronicInfo/index.jsx
# src/components/ScaleTable/index.jsx
# src/containers/ChronicInfo.js
# src/containers/InlineTag.js
commit 849f95a9db0621d30bbea9063db8c23ff8bb61ab
Author: liucf <liucf@zjlantone.com>
Date: Mon Jun 10 16:09:56 2019 +0800
现病史“添加症状”优化
commit afa59c39f3cbc208ceb2ab9b74d9ada531aebf62
Author: liucf <liucf@zjlantone.com>
Date: Mon Jun 10 11:08:08 2019 +0800
Squashed commit of the following:
commit c868b02d52e3e4fad260685579194e225ae36065
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 17:05:25 2019 +0800
Squashed commit of the following:
commit dd6cb763dd0d3fe9cd1433addc45c0421ef4cc51
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:56:24 2019 +0800
编码
commit 795b5e8a7b8817f8779d11279f550fb12d7e237b
Merge: 2ce3753 d3bf8cd
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:51:52 2019 +0800
Merge branch 'icss3_liucf' of http://192.168.2.236:10080/zhouna/newICSS into icss3_liucf
# Conflicts:
# src/components/WrapModalBody/WrapModalTable/index.jsx
commit 2ce3753ee805070d422517127f135d007776f20e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:47:23 2019 +0800
乱码问题
commit d3bf8cd310e0dd422cea0d2deb307da544c6d442
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:26:36 2019 +0800
Squashed commit of the following:
commit a163d3247ead49987bf401710dbc19a12cfb6cea
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:21:07 2019 +0800
Squashed commit of the following:
commit 1ae52de6f979b78e409206cce91a9b53bd79c868
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:56:41 2019 +0800
合并优化分支，并增加导出优化
Squashed commit of the following:
commit 6a9a50766c300152843b87d74ab942dbed65ae17
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:32:06 2019 +0800
Squashed commit of the following:
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/Emergency/index.less
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/fetchModules.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 1f1f1a4a4e6006d21fcd25c6fe197b52cd66c3f8
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:45:20 2019 +0800
bug
commit 4ef3308fa72585ea90d8d8405047d64494bdffee
Merge: aaedab5 920eecc
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:43:08 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 920eecc06eb8318a4bba06a8ba396e634ecaa927
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:40:10 2019 +0800
化验辅检导入完成
commit aaedab57e5956d6279bc4abbe60e5ba33ab6e78d
Merge: 3f452ea 1cbff5c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:39 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 3f452eabf36272554f2019b2c00ff90da5bedc09
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:28 2019 +0800
合并liucf分支
Squashed commit of the following:
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit 1cbff5c945536344a71ba49ebdb36458d003babe
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 17:39:57 2019 +0800
补充说明，删除多余参数
commit 14d0f1cfac1ac6972709fdcb5fb8a4f998cd42cf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 16:06:00 2019 +0800
全部量表查看
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit 504b117ffdf05f2994627697664714156381202c
Merge: 49dc120 f90aeef
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:16:14 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 49dc1205c0e96defa4da1e4598235d47dfd4ec95
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:14:59 2019 +0800
检索数据获取
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit 6408345eee379718cf18a7f5a289e71c0161a46b
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 10:04:26 2019 +0800
添加检索
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/index.jsx
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.jsx
# src/common/components/Calendar/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/TimeInterval/index.jsx
# src/components/TimeInterval/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalRight/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBodyPac/WrapModalRight/index.jsx
# src/components/WrapModalBodyPac/WrapModalTable/index.jsx
# src/components/WrapModalBodyPac/WrapModalTitle/index.jsx
# src/components/WrapModalBodyPac/index.jsx
# src/store/reducers/assistCheck.js
commit 5314a5a4d3b6bd26e2a9eb4546c2a118cbdae894
Merge: 0a8fa8f 6a9a507
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:56:50 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 0a8fa8fe86abc7ddb319fd32d2edba5674dbe82e
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:54:14 2019 +0800
样式调整
commit 18d6650e0410e6353c814f88df97dc7962a745ef
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:43:59 2019 +0800
组件优化
commit 9478fdd8300d79034066ce9aac5f14f362a21a0e
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:35:23 2019 +0800
日期区间选择
commit 6a9a50766c300152843b87d74ab942dbed65ae17
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:32:06 2019 +0800
Squashed commit of the following:
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/Emergency/index.less
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/fetchModules.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 1f1f1a4a4e6006d21fcd25c6fe197b52cd66c3f8
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:45:20 2019 +0800
bug
commit 4ef3308fa72585ea90d8d8405047d64494bdffee
Merge: aaedab5 920eecc
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:43:08 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 920eecc06eb8318a4bba06a8ba396e634ecaa927
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:40:10 2019 +0800
化验辅检导入完成
commit aaedab57e5956d6279bc4abbe60e5ba33ab6e78d
Merge: 3f452ea 1cbff5c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:39 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 3f452eabf36272554f2019b2c00ff90da5bedc09
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:28 2019 +0800
合并liucf分支
Squashed commit of the following:
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit 1cbff5c945536344a71ba49ebdb36458d003babe
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 17:39:57 2019 +0800
补充说明，删除多余参数
commit 14d0f1cfac1ac6972709fdcb5fb8a4f998cd42cf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 16:06:00 2019 +0800
全部量表查看
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit 504b117ffdf05f2994627697664714156381202c
Merge: 49dc120 f90aeef
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:16:14 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 49dc1205c0e96defa4da1e4598235d47dfd4ec95
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:14:59 2019 +0800
检索数据获取
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit 6408345eee379718cf18a7f5a289e71c0161a46b
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 10:04:26 2019 +0800
添加检索
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/common/components/Calendar/index.jsx
# src/common/components/Calendar/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/TimeInterval/index.jsx
# src/components/TimeInterval/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalRight/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBodyPac/WrapModalRight/index.jsx
# src/components/WrapModalBodyPac/WrapModalTable/index.jsx
# src/components/WrapModalBodyPac/WrapModalTitle/index.jsx
# src/components/WrapModalBodyPac/index.jsx
# src/store/reducers/assistCheck.js
commit 1ae52de6f979b78e409206cce91a9b53bd79c868
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:56:41 2019 +0800
合并优化分支，并增加导出优化
Squashed commit of the following:
commit 6a9a50766c300152843b87d74ab942dbed65ae17
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:32:06 2019 +0800
Squashed commit of the following:
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/Emergency/index.less
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/fetchModules.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 1f1f1a4a4e6006d21fcd25c6fe197b52cd66c3f8
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:45:20 2019 +0800
bug
commit 4ef3308fa72585ea90d8d8405047d64494bdffee
Merge: aaedab5 920eecc
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:43:08 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 920eecc06eb8318a4bba06a8ba396e634ecaa927
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:40:10 2019 +0800
化验辅检导入完成
commit aaedab57e5956d6279bc4abbe60e5ba33ab6e78d
Merge: 3f452ea 1cbff5c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:39 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 3f452eabf36272554f2019b2c00ff90da5bedc09
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:28 2019 +0800
合并liucf分支
Squashed commit of the following:
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit 1cbff5c945536344a71ba49ebdb36458d003babe
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 17:39:57 2019 +0800
补充说明，删除多余参数
commit 14d0f1cfac1ac6972709fdcb5fb8a4f998cd42cf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 16:06:00 2019 +0800
全部量表查看
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit 504b117ffdf05f2994627697664714156381202c
Merge: 49dc120 f90aeef
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:16:14 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 49dc1205c0e96defa4da1e4598235d47dfd4ec95
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:14:59 2019 +0800
检索数据获取
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit 6408345eee379718cf18a7f5a289e71c0161a46b
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 10:04:26 2019 +0800
添加检索
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/index.jsx
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/WrapModalBody/WrapModalTable/index.jsx
commit a163d3247ead49987bf401710dbc19a12cfb6cea
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:21:07 2019 +0800
Squashed commit of the following:
commit 1ae52de6f979b78e409206cce91a9b53bd79c868
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:56:41 2019 +0800
合并优化分支，并增加导出优化
Squashed commit of the following:
commit 6a9a50766c300152843b87d74ab942dbed65ae17
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:32:06 2019 +0800
Squashed commit of the following:
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/Emergency/index.less
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/fetchModules.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 1f1f1a4a4e6006d21fcd25c6fe197b52cd66c3f8
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:45:20 2019 +0800
bug
commit 4ef3308fa72585ea90d8d8405047d64494bdffee
Merge: aaedab5 920eecc
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:43:08 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 920eecc06eb8318a4bba06a8ba396e634ecaa927
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:40:10 2019 +0800
化验辅检导入完成
commit aaedab57e5956d6279bc4abbe60e5ba33ab6e78d
Merge: 3f452ea 1cbff5c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:39 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 3f452eabf36272554f2019b2c00ff90da5bedc09
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:28 2019 +0800
合并liucf分支
Squashed commit of the following:
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit 1cbff5c945536344a71ba49ebdb36458d003babe
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 17:39:57 2019 +0800
补充说明，删除多余参数
commit 14d0f1cfac1ac6972709fdcb5fb8a4f998cd42cf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 16:06:00 2019 +0800
全部量表查看
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit 504b117ffdf05f2994627697664714156381202c
Merge: 49dc120 f90aeef
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:16:14 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 49dc1205c0e96defa4da1e4598235d47dfd4ec95
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:14:59 2019 +0800
检索数据获取
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit 6408345eee379718cf18a7f5a289e71c0161a46b
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 10:04:26 2019 +0800
添加检索
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/index.jsx
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.jsx
# src/common/components/Calendar/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/TimeInterval/index.jsx
# src/components/TimeInterval/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalRight/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBodyPac/WrapModalRight/index.jsx
# src/components/WrapModalBodyPac/WrapModalTable/index.jsx
# src/components/WrapModalBodyPac/WrapModalTitle/index.jsx
# src/components/WrapModalBodyPac/index.jsx
# src/store/reducers/assistCheck.js
commit 5314a5a4d3b6bd26e2a9eb4546c2a118cbdae894
Merge: 0a8fa8f 6a9a507
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:56:50 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 0a8fa8fe86abc7ddb319fd32d2edba5674dbe82e
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:54:14 2019 +0800
样式调整
commit 18d6650e0410e6353c814f88df97dc7962a745ef
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:43:59 2019 +0800
组件优化
commit 9478fdd8300d79034066ce9aac5f14f362a21a0e
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:35:23 2019 +0800
日期区间选择
commit 6a9a50766c300152843b87d74ab942dbed65ae17
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:32:06 2019 +0800
Squashed commit of the following:
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/Emergency/index.less
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/fetchModules.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 1f1f1a4a4e6006d21fcd25c6fe197b52cd66c3f8
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:45:20 2019 +0800
bug
commit 4ef3308fa72585ea90d8d8405047d64494bdffee
Merge: aaedab5 920eecc
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:43:08 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 920eecc06eb8318a4bba06a8ba396e634ecaa927
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:40:10 2019 +0800
化验辅检导入完成
commit aaedab57e5956d6279bc4abbe60e5ba33ab6e78d
Merge: 3f452ea 1cbff5c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:39 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 3f452eabf36272554f2019b2c00ff90da5bedc09
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:28 2019 +0800
合并liucf分支
Squashed commit of the following:
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit 1cbff5c945536344a71ba49ebdb36458d003babe
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 17:39:57 2019 +0800
补充说明，删除多余参数
commit 14d0f1cfac1ac6972709fdcb5fb8a4f998cd42cf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 16:06:00 2019 +0800
全部量表查看
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit 504b117ffdf05f2994627697664714156381202c
Merge: 49dc120 f90aeef
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:16:14 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 49dc1205c0e96defa4da1e4598235d47dfd4ec95
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:14:59 2019 +0800
检索数据获取
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit 6408345eee379718cf18a7f5a289e71c0161a46b
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 10:04:26 2019 +0800
添加检索
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/components/WrapModalBody/WrapModalTable/index.jsx
commit dd6cb763dd0d3fe9cd1433addc45c0421ef4cc51
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:56:24 2019 +0800
编码
commit 795b5e8a7b8817f8779d11279f550fb12d7e237b
Merge: 2ce3753 d3bf8cd
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:51:52 2019 +0800
Merge branch 'icss3_liucf' of http://192.168.2.236:10080/zhouna/newICSS into icss3_liucf
# Conflicts:
# src/components/WrapModalBody/WrapModalTable/index.jsx
commit 2ce3753ee805070d422517127f135d007776f20e
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:47:23 2019 +0800
乱码问题
commit d3bf8cd310e0dd422cea0d2deb307da544c6d442
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:26:36 2019 +0800
Squashed commit of the following:
commit a163d3247ead49987bf401710dbc19a12cfb6cea
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 16:21:07 2019 +0800
Squashed commit of the following:
commit 1ae52de6f979b78e409206cce91a9b53bd79c868
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:56:41 2019 +0800
合并优化分支，并增加导出优化
Squashed commit of the following:
commit 6a9a50766c300152843b87d74ab942dbed65ae17
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:32:06 2019 +0800
Squashed commit of the following:
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/Emergency/index.less
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/fetchModules.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 1f1f1a4a4e6006d21fcd25c6fe197b52cd66c3f8
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:45:20 2019 +0800
bug
commit 4ef3308fa72585ea90d8d8405047d64494bdffee
Merge: aaedab5 920eecc
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:43:08 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 920eecc06eb8318a4bba06a8ba396e634ecaa927
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:40:10 2019 +0800
化验辅检导入完成
commit aaedab57e5956d6279bc4abbe60e5ba33ab6e78d
Merge: 3f452ea 1cbff5c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:39 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 3f452eabf36272554f2019b2c00ff90da5bedc09
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:28 2019 +0800
合并liucf分支
Squashed commit of the following:
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit 1cbff5c945536344a71ba49ebdb36458d003babe
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 17:39:57 2019 +0800
补充说明，删除多余参数
commit 14d0f1cfac1ac6972709fdcb5fb8a4f998cd42cf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 16:06:00 2019 +0800
全部量表查看
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit 504b117ffdf05f2994627697664714156381202c
Merge: 49dc120 f90aeef
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:16:14 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 49dc1205c0e96defa4da1e4598235d47dfd4ec95
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:14:59 2019 +0800
检索数据获取
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit 6408345eee379718cf18a7f5a289e71c0161a46b
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 10:04:26 2019 +0800
添加检索
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/index.jsx
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.jsx
# src/common/components/Calendar/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/TimeInterval/index.jsx
# src/components/TimeInterval/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalRight/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBodyPac/WrapModalRight/index.jsx
# src/components/WrapModalBodyPac/WrapModalTable/index.jsx
# src/components/WrapModalBodyPac/WrapModalTitle/index.jsx
# src/components/WrapModalBodyPac/index.jsx
# src/store/reducers/assistCheck.js
commit 5314a5a4d3b6bd26e2a9eb4546c2a118cbdae894
Merge: 0a8fa8f 6a9a507
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:56:50 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 0a8fa8fe86abc7ddb319fd32d2edba5674dbe82e
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:54:14 2019 +0800
样式调整
commit 18d6650e0410e6353c814f88df97dc7962a745ef
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:43:59 2019 +0800
组件优化
commit 9478fdd8300d79034066ce9aac5f14f362a21a0e
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 15:35:23 2019 +0800
日期区间选择
commit 6a9a50766c300152843b87d74ab942dbed65ae17
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:32:06 2019 +0800
Squashed commit of the following:
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/Emergency/index.less
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/fetchModules.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 1f1f1a4a4e6006d21fcd25c6fe197b52cd66c3f8
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:45:20 2019 +0800
bug
commit 4ef3308fa72585ea90d8d8405047d64494bdffee
Merge: aaedab5 920eecc
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:43:08 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 920eecc06eb8318a4bba06a8ba396e634ecaa927
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:40:10 2019 +0800
化验辅检导入完成
commit aaedab57e5956d6279bc4abbe60e5ba33ab6e78d
Merge: 3f452ea 1cbff5c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:39 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 3f452eabf36272554f2019b2c00ff90da5bedc09
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:28 2019 +0800
合并liucf分支
Squashed commit of the following:
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit 1cbff5c945536344a71ba49ebdb36458d003babe
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 17:39:57 2019 +0800
补充说明，删除多余参数
commit 14d0f1cfac1ac6972709fdcb5fb8a4f998cd42cf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 16:06:00 2019 +0800
全部量表查看
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit 504b117ffdf05f2994627697664714156381202c
Merge: 49dc120 f90aeef
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:16:14 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 49dc1205c0e96defa4da1e4598235d47dfd4ec95
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:14:59 2019 +0800
检索数据获取
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit 6408345eee379718cf18a7f5a289e71c0161a46b
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 10:04:26 2019 +0800
添加检索
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/common/components/Calendar/index.jsx
# src/common/components/Calendar/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/TimeInterval/index.jsx
# src/components/TimeInterval/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalRight/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBodyPac/WrapModalRight/index.jsx
# src/components/WrapModalBodyPac/WrapModalTable/index.jsx
# src/components/WrapModalBodyPac/WrapModalTitle/index.jsx
# src/components/WrapModalBodyPac/index.jsx
# src/store/reducers/assistCheck.js
commit 1ae52de6f979b78e409206cce91a9b53bd79c868
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:56:41 2019 +0800
合并优化分支，并增加导出优化
Squashed commit of the following:
commit 6a9a50766c300152843b87d74ab942dbed65ae17
Author: liucf <liucf@zjlantone.com>
Date: Thu Jun 6 14:32:06 2019 +0800
Squashed commit of the following:
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/HisList/index.jsx
# src/components/Emergency/HisList/index.less
# src/components/Emergency/index.jsx
# src/components/Emergency/index.less
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/fetchModules.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 1f1f1a4a4e6006d21fcd25c6fe197b52cd66c3f8
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:45:20 2019 +0800
bug
commit 4ef3308fa72585ea90d8d8405047d64494bdffee
Merge: aaedab5 920eecc
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:43:08 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 920eecc06eb8318a4bba06a8ba396e634ecaa927
Author: Luolei <16657115156@163.com>
Date: Thu Jun 6 13:40:10 2019 +0800
化验辅检导入完成
commit aaedab57e5956d6279bc4abbe60e5ba33ab6e78d
Merge: 3f452ea 1cbff5c
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:39 2019 +0800
Merge branch 'optimize' of http://192.168.2.236:10080/zhouna/newICSS into optimize
commit 3f452eabf36272554f2019b2c00ff90da5bedc09
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:40:28 2019 +0800
合并liucf分支
Squashed commit of the following:
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/containers/ScaleSearchContainer.js
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit 1cbff5c945536344a71ba49ebdb36458d003babe
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 17:39:57 2019 +0800
补充说明，删除多余参数
commit 14d0f1cfac1ac6972709fdcb5fb8a4f998cd42cf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 16:06:00 2019 +0800
全部量表查看
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit 504b117ffdf05f2994627697664714156381202c
Merge: 49dc120 f90aeef
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:16:14 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 49dc1205c0e96defa4da1e4598235d47dfd4ec95
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 14:14:59 2019 +0800
检索数据获取
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit 6408345eee379718cf18a7f5a289e71c0161a46b
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 10:04:26 2019 +0800
添加检索
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/common/components/Calendar/index.less
# src/common/components/WrapModalContainer/index.jsx
# src/common/components/WrapModalContainer/index.less
# src/components/AssistCheck/index.jsx
# src/components/Emergency/index.jsx
# src/components/Inspect/index.jsx
# src/components/Inspect/index.less
# src/components/ScaleSearch/index.jsx
# src/components/ScaleSearch/index.less
# src/components/WrapModalBody/Item/index.jsx
# src/components/WrapModalBody/WrapModalTable/index.jsx
# src/components/WrapModalBody/WrapModalTitle/index.jsx
# src/components/WrapModalBody/index.jsx
# src/components/WrapModalBody/index.less
# src/containers/Inspect.js
# src/containers/ScaleSearchContainer.js
# src/store/types/inspect.js
# src/utils/drag.js
# src/utils/tools.js
commit 3c4dd239cb9ba32ba0fcee82e30864c2c69dc871
Author: liucf <liucf@zjlantone.com>
Date: Wed Jun 5 14:40:34 2019 +0800
全科病历细节优化
commit 5294585ebded597041f65b614815aa13cb8d0a58
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 17:34:59 2019 +0800
添加时间筛选
commit 23fc91ea79b0f5f2122b19f08155784b7c8238d5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 16:14:30 2019 +0800
合并优化分支
Squashed commit of the following:
commit 6de3fad484f6aa57daa6bcb00e3179c567bae2d9
Merge: 0af6118 f90aeef
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:43 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
commit 0af61189386522a227a25e5f3ac1f1a86bd1eb10
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 15:28:30 2019 +0800
全部量表接口对接
commit d67b5e9cf980afbd3d9b09a84114b1196281e431
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:50:07 2019 +0800
引用病例推送检查重复调用
commit f7434ab9d3c270e9058988d18bb2a8414b4b0cbd
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 13:34:05 2019 +0800
删除无效代码
commit f90aeef464ab17eaa3509319a9961e10e0e62312
Merge: 7791b5b 60b0cb5
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:57:49 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 60b0cb5910ae9562e8b4f1f07310c461b9ca748c
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:56:52 2019 +0800
1
commit 98b2f3d0a81c2e24d61e374c54807a121f115c92
Author: Luolei <16657115156@163.com>
Date: Tue Jun 4 09:54:57 2019 +0800
添加注释
commit 98f3939410037828e647453e5008cf6fcc14babc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:30:23 2019 +0800
双击编辑蓝底选中消除
commit 250d2ba147aa705047879d1d2b67c34bffe89258
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jun 4 09:25:21 2019 +0800
无返回数据loading也关闭
commit 7791b5b679437efd590623789d473458961b2646
Merge: b926b8c 96a6fd2
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:25:13 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 96a6fd268033ac6953a4f48ebc7242e2faf8ff9e
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:23:01 2019 +0800
console
commit 63897f7a04aad3a207b921026656b9c8f1a0f6a4
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 17:22:01 2019 +0800
时间插件修改，区间选择组件完成
commit dffa61771828ff0f486919a09562e24b29cdea2c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 17:16:20 2019 +0800
删除多余代码和推送调用
commit e4fd3e22378e3b6dd159b400682bf21646e08378
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:35:48 2019 +0800
推送参数对比函数bug修改
commit f1c7b1934d2cca472ad44641d0247870ed9b0c1c
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 16:11:01 2019 +0800
全部量表-接口未对
commit b926b8c33a3535e3d5341f3e94ee853d39c91b89
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 15:52:09 2019 +0800
加收起展开按钮
commit a7cd00e68421464a68523d2df85caa9871af5cec
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 14:44:32 2019 +0800
加清空按钮
commit 4742892f6ba752689bacffe3828d00f5e29e9555
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 11:50:59 2019 +0800
静态知识搜索
commit 16c48a0629d0900c4e67fc5c8590f78e814f9206
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:53:13 2019 +0800
指标推送收起展开效果
commit 2442d00474a875a09671259f0052f42f46217690
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:32:58 2019 +0800
指标推送收起展开bug修改
commit d49848ce253a774838fe111e9f7f6eb91c74b941
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Jun 3 10:30:18 2019 +0800
删除多余文件
commit da614e0d4c6119278b211f5fd769611557740acc
Author: Luolei <16657115156@163.com>
Date: Mon Jun 3 10:16:34 2019 +0800
date
commit 5ea348245d8061aee67efdf04c7d6cbacdd2a1af
Merge: 84a47f4 99af44b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:45:44 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 84a47f400db92078a0ef92e8f5fce7e1c7e90fa1
Merge: fd6e7ff 8f53d2e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:38:51 2019 +0800
Merge branch 'ChronicMag' into optimize-zxc
commit 99af44b61c4c9c6d9680ddcccf32cb9cc10e5ab8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:45 2019 +0800
注释医学知识（未完成）
commit a6065dc09996a65640b4a48783eb2e9ded4b8359
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:31:08 2019 +0800
注释医学知识（医学知识未完成）
commit fd6e7ff7f036ea48795dbee290bac393d55757eb
Merge: 8e2d799 0755f5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:29:04 2019 +0800
merge from 'origin'
commit 8e2d79940befe9715dfd54ccf179fd710274aec9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 16:27:53 2019 +0800
医学知识
commit 0755f5c881b2022cbaebf1a937c2bcb207417150
Merge: 4d1f197 7113420
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 15:57:37 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/store/async-actions/pushMessage.js
commit 4d1f19780b40256265c95aecfa9a08535ce29707
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 14:29:53 2019 +0800
指标推送收起展开
commit 711342004f84e8cbdaac78c1e101363b7fa44e1d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:16:25 2019 +0800
静态信息修改
commit bb7e1aa388cd1d6304942f6623b2123903341155
Merge: bad3590 77026bb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 14:03:45 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit bad3590764a6b4b04a99ec4e6486df3d8f938eb7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri May 31 11:41:33 2019 +0800
右侧推送组件提取
commit 930f2ad9d465b9d7bba7628e8bdd1f60638cac95
Author: zhouna <zhouna@zjlantone.com>
Date: Fri May 31 10:24:29 2019 +0800
文本模式推送接口修改
commit eb1b26500858b99ec3643f4f9033cc3cdf2d5ebe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 17:18:59 2019 +0800
推荐检验检查（未完成）
commit 77026bb1c76616aca71c7d2b858e68aa83d621d0
Author: Luolei <16657115156@163.com>
Date: Thu May 30 15:47:19 2019 +0800
同时出现两个拖拽弹窗处理
commit 75c0db17f4758393e8a7c541efd9da91a25902e5
Merge: 7346d73 7d52d97
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 14:54:10 2019 +0800
Merge branch 'optimize' into optimize-zxc
commit 7d52d977839b208fafe011a5785df2fdd7301699
Merge: 5b0c6c6 34ccfe1
Author: Luolei <16657115156@163.com>
Date: Thu May 30 14:10:55 2019 +0800
Merge branch 'optimize-ll' into optimize
commit 7346d73ed52b5134b8eb90e0282cfc7327be82ec
Merge: 0d0fabe 34ccfe1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 13:53:28 2019 +0800
Merge branch 'optimize-ll' into optimize-zxc
commit 34ccfe17729d27aa445010dcc67f35e38bce8c63
Author: Luolei <16657115156@163.com>
Date: Thu May 30 13:51:58 2019 +0800
接口对接，弹窗代码优化
commit 0d0fabe62cbc20225911adbd50e6456489084284
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu May 30 09:48:06 2019 +0800
免责声明和版本信息
commit 335db8568bcbccd0b0ddd0056d79d48056036f8b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 17:20:12 2019 +0800
推送接口对接
commit cf9d835e17aef5c00181312ac7de5e0ebb6045fd
Merge: e3ef981 50d2cce
Author: Luolei <16657115156@163.com>
Date: Wed May 29 17:02:07 2019 +0800
Merge branch 'optimize-zxc' into optimize-ll
commit e3ef981021b94497c994430b400beb58e6173055
Merge: 1ed52ce 719c2cc
Author: Luolei <16657115156@163.com>
Date: Wed May 29 16:59:40 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 50d2cce7bdbeaf883fb37595e7b3e1e48b00f45b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 16:17:22 2019 +0800
说明书修改
commit 5b0c6c6324cd6fd8e2491aa5285c0205d5389a7c
Merge: 2925167 719c2cc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:55:22 2019 +0800
Merge remote-tracking branch 'origin/optimize' into optimize
# Conflicts:
# src/utils/tools.js
commit 2925167e24df0bc7a1a5d788c653db63b564d020
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 15:54:42 2019 +0800
管理评估，图表接口对接
commit 1ed52ce1a6d42eaef6d6c622f3b6ae97aba9bfed
Author: Luolei <16657115156@163.com>
Date: Wed May 29 15:47:58 2019 +0800
拖拽
commit 4ee10e346d3aacac930f594f442a41e6a1d72336
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed May 29 15:47:42 2019 +0800
药品说明书
commit 509eb82e53e69e2898d932f1f4792fdb295ebe2a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed May 29 13:53:29 2019 +0800
指标推送量表加入按钮bug修改
commit 8f53d2e8754ff1d448a517b554d53bee6d427a05
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue May 28 17:20:37 2019 +0800
修改删除诊断图标bug
commit 4cfe762692950831638ecf4b1c611868682ea2e2
Merge: 9bd0b47 afadf59
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:58:05 2019 +0800
Merge branch 'optimize' into optimize-ll
commit 9bd0b4776490cd09749a4918c57a8c098d895628
Author: Luolei <16657115156@163.com>
Date: Mon May 27 16:56:41 2019 +0800
11
# Conflicts:
# src/store/async-actions/diagnosticSearch.js
# src/store/index.js
# src/utils/tools.js
commit c36cc8f097eb25a397953f4b66be68788273b2e5
Author: liucf <liucf@zjlantone.com>
Date: Tue Jun 4 15:58:53 2019 +0800
急诊全科历史病历，还缺时间筛选
commit 561a4ac54d3cfe9f54eb3d723bc6f258977f9309
Author: liucf <liucf@zjlantone.com>
Date: Wed May 29 17:41:57 2019 +0800
急诊科病例列表入口
# Conflicts:
# src/components/AssessResult/ScaleItem/index.jsx
# src/components/ChronicInfo/index.jsx
# src/components/ScaleSearch/index.jsx
# src/containers/ChronicInfo.js
# src/containers/ScaleSearchContainer.js
liucf
8 ändrade filer med 246 tillägg och 51 borttagningar
+ 1
- 1
src/common/components/Textarea/index.jsx
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 54
- 4
src/components/ChronicInfo/index.jsx
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 157
- 22
src/components/ScaleTable/index.jsx
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 11
- 2
src/components/ScaleTable/index.less
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 2
- 2
src/containers/ScaleSearchContainer.js
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 2
- 1
src/containers/ScaleTable.js
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 6
- 1
src/store/actions/checkBody.js
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 13
- 18
src/store/actions/currentIll.js
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||