浏览代码
合并liucf分支
合并liucf分支
Squashed commit of the following:
commit 63303a629178a6c327ae402262dfaf8885b3332d
Author: liucf <liucf@zjlantone.com>
Date: Tue Mar 5 10:28:02 2019 +0800
现病史空模板处理
commit 9e748c97a82a417812ae6f416f70827867185081
Merge: 3cf35e1 f353eae
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 16:10:25 2019 +0800
Merge branch 'IE_test' of http://192.168.2.236:10080/zhouna/newICSS into IE_test
# Conflicts:
# src/common/components/Textarea/index.less
# src/components/AddAssistCheck/Textarea/index.less
commit 3cf35e1da1e6a3ef203d27c4875ccc4ba2ea556c
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 16:09:24 2019 +0800
合并new1
Squashed commit of the following:
commit 70e968a78a10c520fa092cd979e0e03475523dc4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 09:25:57 2019 +0800
修改诊断搜索参数
commit 77ca8b29d1fc647e6765ebe0330b52ea88bd606f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 18:12:20 2019 +0800
合并错误修改
commit a20149638473c75479c56deb365db7c328a558cb
Merge: cfc64ea 6b7dfbb
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 18:08:43 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/store/async-actions/homePage.js
commit cfc64eaaaf0c98941c04be7b355aa646ecb3c560
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:27:09 2019 +0800
标点加英问号
commit 6b7dfbb33bd85d54dff60649f913b2fef6f8ce0c
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:24:55 2019 +0800
bug提交
commit 35a9c17b604893b2d97c45143128e5ea4d8d15bc
Merge: 11d0086 a0beff1
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:17:00 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit 11d00865399c3ba8bf5afe096ca3f3856c86be36
Merge: 4f214b2 422c5cf
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:16:54 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/components/DiagResultSearch/index.jsx
commit 4f214b2a23fd9bacb6671e191f7e42544c7b87af
Merge: c721d35 9378eb8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:15:36 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c721d35ada039c262724106b4b8d0342573e36ec
Merge: b8f144b 0f0c391
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:15:32 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 9378eb8bfca2571b7ed6e83560f2decaded45f2c
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 16:55:33 2019 +0800
其他史selecteds为空bug修改
commit f6fec4a2b2f25e1b8d89b62601baa63a2cefe968
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 16:38:02 2019 +0800
修改清空后第一次点击键盘不触发click事件bug
commit c11b47d06e11c024a17f02b5648a800405d88ff5
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 10:28:17 2019 +0800
其他史文本模式数据bug修改
commit 422c5cfdfaa0312d65cce2c717de1f1b2f63755b
Merge: b479e52 b8f144b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 10:25:45 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit b479e52191221be49d4417308014517a821d8d41
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 10:21:39 2019 +0800
修改诊断搜索
commit b8f144b7c2c1fb60d208525d29dc1a1a38280edb
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 09:44:49 2019 +0800
去重标点添加
commit 345ea481613f2fe5beb8aacdc117ce022a60f1b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 09:23:31 2019 +0800
修改常用药物慎用标识透明度
commit 0f0c3911304b587351e1d53627a9f1a314f9173a
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:08:54 2019 +0800
11
commit 58d128cb772f05fbf90974b0187ce2fa91905f76
Merge: 5ec2c5b 21e2bf6
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:28:55 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 5ec2c5be9b99f40fd7322ea4299a8ef5ddbfbf5a
Merge: e3965b6 f388f66
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:28:51 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit e3965b6f49b9325a9a6aa6f9e3382d8e6be8b6b9
Merge: ba2209b b37ea33
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:28:18 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit ba2209baa70ce98557956e4ee5e24659537b4e41
Merge: c7033dc 2fc00bd
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:22:41 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2fc00bd2a0c2c83d0b3a763147a5196f36ed2513
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 17:56:22 2019 +0800
病例滚动条上面不遮挡导入按钮上移
commit 21e2bf63e19461fc8956c991678d11ada4abad61
Merge: 56412f4 c7033dc
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 28 15:49:11 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 56412f467c018e2ce22415a54a36be230126b5fe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 28 15:47:21 2019 +0800
注释查看药品说明书
commit 7a306c9f203aa3e7c67a6c2138adbe2602b9aa56
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 15:44:55 2019 +0800
修改其他史查体杂音类选中bug
commit f388f660e2062b82ac39984f21bcd1603982f911
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 12:28:02 2019 +0800
1
commit c7033dc0fa9b576fd44ad580a70d9dc3c9abbc21
Merge: 24781b3 9b8aba5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 12:26:47 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 24781b351a21c98c7f0185b808c6cb2c8459cab8
Merge: dd471cd 686d0e6
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 12:26:41 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit dd471cd31cd4f5e8bee1cc4394afc2d1ec645d27
Merge: fdfd012 beee05d
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 12:26:32 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit fdfd0120716eea088da637b233700b07e6865f53
Merge: 47805f3 6c7eff1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 12:26:16 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 6c7eff13a7a93e7e50d569a72155a280973c1053
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 09:59:02 2019 +0800
excel导入日期时间戳格式转换
commit 92eb95e4a13cc141cf115fd59ba96eb9c4ad81f8
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 09:35:49 2019 +0800
化验清空只清空数据
commit 9b8aba56d77ce741849edf60453f395ec7a17959
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 17:00:35 2019 +0800
清空后其他史杂音类选中状态bug修改
commit cca4e2b37197823231e6cbe1407b93ab2c1cb49e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:38:03 2019 +0800
标点补充
commit 686d0e6888cbe437c6126b079f546c5a7b811ae7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 16:34:13 2019 +0800
点击开单项到医嘱
commit 47805f396f0acda35a73a8fbe23a2b290af60a84
Merge: dbfbe54 0ab03d2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:20:13 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit dbfbe549b65f8dea75579b10e02d7a4d022929a2
Merge: ba95b15 24a72ee
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:20:08 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit ba95b154cd8f0acb6ac3cbdd0f56c2b5cd128a51
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:17:59 2019 +0800
主诉合并错误修改
commit 545d910e9331f21ab16be77ab7ac326ad3de580d
Merge: a261f0c 48728c3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:15:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/MainSuit/index.jsx
# src/components/PreviewBody/index.jsx
# src/components/PrintPreview/index.jsx
# src/components/TreatDesc/DrugInfo/index.jsx
# src/store/actions/diagnosticList.js
# src/store/actions/otherHistory.js
# src/store/reducers/assistCheck.js
# src/store/reducers/otherHistory.js
commit 6b6082ca9ad86cab359874b6089815719b51d7d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 16:04:10 2019 +0800
Revert "第一个诊断为复诊添加到诊断调用推送接口"
This reverts commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d.
commit a261f0c60ae06808381dd443b5d8cef42760d953
Merge: f2cb210 7e81b63
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:58:46 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 0ab03d2eba0865ebdda8c8b9eb84e5dea7f07b59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:53:28 2019 +0800
标点规则：中间连续标点保留第一个，开头去掉，结尾保留第一个，灰色不显示
commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 15:40:32 2019 +0800
第一个诊断为复诊添加到诊断调用推送接口
commit cd02a522c6054deb9ade0fed202338dd1ce9021b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:26:16 2019 +0800
输入再删除输入不搜索bug修改
commit e62e0aa6083ed13edbbfc36124ff79363ddaba38
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:16:58 2019 +0800
推送参数加主诉
commit 134276afd973d5b5d8e07389cee27eb9391e9247
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:14:00 2019 +0800
双击编辑状态关闭bug
commit 769c60daabd81ef48f37f5227e9a55fb205ce5ee
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:11:43 2019 +0800
化验颜色不一致
commit e3ad8a2d18a21cc770b9c303d92146bbe78e4d8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 14:10:40 2019 +0800
有选中无殊未灰bug修改
commit 581c9dbc6f714c5e795a45102cb095cf84738522
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 14:04:07 2019 +0800
杂音类单选bug修改
commit 20a3edfe13f4c24c2748758f28bd488aa2ca6ea1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 09:37:07 2019 +0800
推荐检查项没内容时，开单按钮置灰
commit 970c4d7db52af55f2e9d39ce3401289683a8f297
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 17:39:35 2019 +0800
常用药物治疗添加类名置灰状态
commit 7e81b634b0952dc237048ee99f41364e360cea84
Author: Luolei <16657115156@163.com>
Date: Tue Feb 26 17:38:04 2019 +0800
清除添加化验辅按钮浮动，打印医生名字位置，辅检标题小屏幕换行，模板接口进入页面没有调用问题
commit f2cb21089d2c321a9cc6b5e666627c6a75e275db
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 17:25:29 2019 +0800
数字键盘在组合中样式bug修改
commit dd03327ec3396302fb66f3f60f7b24c0ff730e6c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 16:53:48 2019 +0800
点击开单聚焦到医嘱
commit 179d7080d06e284ed973d59c5a76ed3dc6a26daf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 16:43:01 2019 +0800
重复修改，回退
commit 7beb5f11bab81ae4535eaf2e61136ab71d06e0aa
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 16:41:17 2019 +0800
修改1024样式bug
commit 7ad8183615802729dc3bbb6507c864a376e79bb6
Merge: fca4a15 66e5e26
Author: Luolei <16657115156@163.com>
Date: Tue Feb 26 16:07:59 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit fca4a15e3ab974f4c684496f43f76afa606a23bc
Author: Luolei <16657115156@163.com>
Date: Tue Feb 26 16:06:12 2019 +0800
回读div里的模拟placeholder清空，辅检出现两次，模板列表为空高度问题，火狐div清空还有个换行符去掉
commit 66e5e26b6541d8923222f43852e56d91252a1c84
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 15:20:20 2019 +0800
修改提示信息疾病说明菜单按钮光标形状
commit ef15ad95e416155b911c474742cf526bbad9b041
Merge: c051e01 8911ac8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 15:15:58 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit c051e0198219bc143a535bac13afa3dfcd90696c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 15:14:39 2019 +0800
药品说明书多个Id查询
commit 8911ac8887de34bdef955a59462f260fc2c6962b
Merge: d31a749 37f085a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 13:19:19 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit d31a749c48b6f6b1e6725575fd09f84f71ebfd9b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 13:19:06 2019 +0800
搜索后加标点测回
commit 30000aad93762077ef746ef683fd2a47c14b3853
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 11:22:11 2019 +0800
其他史查体搜索的标签后加逗号
commit 37f085a3d788fd707c76bca36d9cd714f0d03742
Merge: 9112336 13dce94
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 11:17:23 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 9112336c27d8e2c1c143b75b8d8bf03f85b528f1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 11:16:40 2019 +0800
修改推送添加到诊断
commit 13dce94fec6b39d0ddf4d0b0322bd84fadddc860
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 10:14:36 2019 +0800
1024合并bug修改
commit d1cb01259d8eab3933cd5166c6e39c6e9ec85516
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 10:12:56 2019 +0800
同类药判断添加名称判断（有的同类药id为null）
commit 536ab1e7dc67936fa9a586f8d55ad1c6d2ee60ba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:41:41 2019 +0800
修改药品说明书标题宽度
commit c855d6416f7509f8ac7d6cb437790a11ad8d93d9
Merge: feceb08 25a000f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:41:03 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 25a000f38ba5cdfb6fdb174c54341f9b058f2dd7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:40:26 2019 +0800
Revert "修改药品说明书标题宽度"
This reverts commit 576b54554b36e37ea0eb80e815ad381772b19cc5.
commit 576b54554b36e37ea0eb80e815ad381772b19cc5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:38:52 2019 +0800
修改药品说明书标题宽度
commit 51a04b0d5f4f7124e9ae63240a32ed39b945f50b
Merge: 644d713 0236d09
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:19:58 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 644d7138c63af93af0e0286644367726d3da2ba0
Merge: fa1380f c7236c8
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:19:37 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7236c894382e11b0a4051f097643e857bf8f065
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:19:06 2019 +0800
两边对齐火狐兼容
commit fa1380f7bafb00efe15a3c1e487f162f2594a913
Merge: e0bc863 96ced84
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:12:10 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit feceb083da47d70c70db09cc69ce6359e907ecb2
Merge: 0236d09 e0bc863
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 20:10:43 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 0236d096817f2a3b0b04a67a3a44b3394014e267
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 20:01:41 2019 +0800
药品禁用状态i图标不置灰
commit 96ced84b7cd01fecf31a546ef58a2375bdfb2e37
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:00:10 2019 +0800
说明书标题去空格
commit a073a592d34258a699b123e4dec909cc0c4c73a8
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:52:14 2019 +0800
药品说明书排版
commit e0bc863cca36de3ab8f8398352f72642780728d9
Merge: 853319f 3fd13c2
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:18:29 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 3fd13c27d56310fc94d46f4e14f374a4de4dd8fa
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:18:02 2019 +0800
数字框蓝色背景显示修改
commit 853319fd0394943edd4945e24701e837f71cf1ac
Merge: 6211dfd 07d7ab9
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:14:47 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 07d7ab98655cbe928b1ac037bcd3889e59918dbb
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:14:09 2019 +0800
数字键盘输入优化，bug修改
commit 6211dfdbb509b4fa4b555899887b119e2333ef41
Merge: ca9f83c 4c41407
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 18:36:49 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit ca9f83c2e9296cb408f91cd53cdf7eae22a39993
Merge: 2897015 d8fc333
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 18:35:58 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/utils/tools.js
commit d8fc333a180f46d4b4fad31cd39e1362e3b1f206
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 18:17:49 2019 +0800
火狐placeholder模拟
commit 4c414071774ef37e1ac57739d72e4b35e8456a8d
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 17:43:26 2019 +0800
双击删除标签时删除后面的标点
commit 2897015cc3d9fd4bc687c88de707a965d30f1f80
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 17:07:24 2019 +0800
清空等条件判断
commit 298014e4aefc250ce60555d316be355b469abad5
Merge: d8b2728 54ed95b
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 16:55:02 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/EMRContainer/index.less
# src/components/MainSuit/index.jsx
# src/components/Operation/index.jsx
# src/components/Operation/index.less
commit d8b2728b1c4484c4327ea2fd1c5be54a87e802f5
Merge: 827b9fe 6ff3c2f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 16:49:36 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 6ff3c2f91b7a21f20081c4feb7cdbeb0fe94f61b
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 16:46:01 2019 +0800
性别判断提示位置更改
commit 827b9feb46ed370019aef767270dc98240a3a60d
Merge: 3164918 f18aff0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 16:21:51 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit f18aff0c73b774231f1894446b877e67f7bf1bcf
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 16:15:52 2019 +0800
其他史数据判断补充
commit 3164918c9c57afd13cd89077ee356ed0541458f0
Merge: a3c6497 0adcc7b
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 15:42:23 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 0adcc7bf5f39b10a3c2254cf1633d9ffd05e6073
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 15:40:14 2019 +0800
数据判断有误
commit a3c649762af9a4d8b66db4f678e62c708cca301b
Merge: af35906 fa664ff
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 15:12:20 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/components/PushContainer/index.less
commit af359067b1d3c08d5329f89ab0565d9eeaa8d49d
Merge: 4785b29 c33cd61
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 15:06:45 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c33cd619b6aca13ec5a5fadbe66bfe4b71f5ed81
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 14:51:06 2019 +0800
双击编辑蓝色边框
commit 4785b29ea0eb3c58b5f508ddf9e2a65fd5b96247
Merge: 942579e e665919
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 13:41:56 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/components/PreviewBody/index.less
commit e6659190bc72350a2b1848d30d1098aa61f29849
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 13:37:52 2019 +0800
模板部分滚动条显示出来
commit 942579e843fef29e00e4764d4acac312a51496ec
Merge: 2b7ce81 7a014d0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 13:35:56 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 7a014d0d797d7e90f88a8d0f939c9845096b0411
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 13:35:18 2019 +0800
有糖尿病bug修改
commit a66f41acdd18acfa5dd6343178571743f1193226
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 13:32:44 2019 +0800
其他史查体回读bug修改
commit fa664ffcfa65bd1438999b0f9e79f99c80f7d531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 11:30:05 2019 +0800
删除诊断没有id时（添加名称判断）
commit 86720794a59da37c8700f72e96740bcdf1906dc8
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 11:27:23 2019 +0800
bug
commit 3de2cf0c7fae1a0f1a994ee604f696d1f64c191e
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 11:09:44 2019 +0800
1024下历史病例显示问题，清空主诉聚焦不在span
commit 3f9e94c357e549318c1e79a04842a4c477d58974
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 10:03:29 2019 +0800
pushContainer添加定位信息
commit ec0a210bc616de96a0ed48df41300fcf95f6b1f3
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 10:02:01 2019 +0800
预览宽度有误
commit 2b7ce81ae4a157abf013f3b2f156b5d280f9403e
Merge: 78fe295 de5b6f2
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 09:52:32 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/components/OtherHistory/index.jsx
# src/components/PreviewBody/index.jsx
commit de5b6f2da0953c8bce31d166490d633f5c8d39c4
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 09:41:50 2019 +0800
模板男女弹窗样式调整
commit b2b959689c9b48b7e82b07766b7320952d649dbd
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 09:25:31 2019 +0800
弹窗高度动态变化
commit a2006f9c3a15df6225e8f5664e3f8330e9def1b7
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 09:22:25 2019 +0800
弹窗宽度变化
commit c6d4ec0ba654f8ed6d25c92f592c11fa8dfc0491
Author: Luolei <16657115156@163.com>
Date: Sun Feb 24 16:51:25 2019 +0800
bug
commit 8bfb380ec8366c43dbd2d3a0078ccc9f13816d62
Author: Luolei <16657115156@163.com>
Date: Sun Feb 24 11:10:18 2019 +0800
连续两个句号处理
commit fb65e9d6a4af98dcfafc8008963a59e9ef368dbb
Author: Luolei <16657115156@163.com>
Date: Sun Feb 24 10:45:55 2019 +0800
判断是否为空只判断文本不判断结构
commit 1749ad61e39543920defb0e8be1d7ce61a03a7bb
Author: Luolei <16657115156@163.com>
Date: Sun Feb 24 10:34:52 2019 +0800
男女模板区分
commit ef798e435a077495c1e84d3ca6893a7e78470119
Author: Luolei <16657115156@163.com>
Date: Fri Feb 22 17:28:30 2019 +0800
模板性别
commit 78fe295b3e69c7e7720b73ea67d3ffcc347f8554
Merge: d5b22a1 3abdfe7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 17:25:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit d5b22a1659068387f4fd1cd0a76d10da296f9511
Merge: 52a81ab e073408
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 17:24:55 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/CheckBody/index.jsx
# src/components/MainSuit/index.jsx
# src/components/SpreadDrop/index.jsx
commit 52a81abd66ca014880035ac04d229f22c54f9768
Merge: 6b572c4 b133db8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 17:16:29 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 3abdfe7396e7375d4d9a5fbafe0d11705494a101
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 16:35:13 2019 +0800
其他史查体删到只剩一个文本标签时整行可落光标
commit 65bf32b0cedb716f36c2d9bcba9cc79993a35cbc
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 16:24:27 2019 +0800
删除多余代码
commit 333360a86405a53dc566e1db80812c62e9ada9df
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 16:18:58 2019 +0800
其他史查体提示优化，未获取到数据的情况优化
commit b133db8b2ebe68183f0fca8a934b79e037ab2702
Author: Luolei <16657115156@163.com>
Date: Fri Feb 22 15:14:08 2019 +0800
11
commit 6b572c48f1c7b75e669aa328ab8d0c8271cd6a5f
Merge: d7668cb 3131b2d
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 15:12:02 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 3131b2d66e39cb5df50b50a1512f3b3d7878cc83
Author: Luolei <16657115156@163.com>
Date: Fri Feb 22 10:56:58 2019 +0800
主诉搜索框位置
commit d7668cbc0bb1a57218083423f483367f6b6a1bbd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 10:13:02 2019 +0800
杂音类变量串bug
commit 5ef7897748fe81cfc3a1e9e30a9cad9eb8576fac
Merge: 77daf9d 0de92f7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 09:46:01 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/components/NumberDrop/index.jsx
commit 77daf9d197cf583de16612dbc20339502081545f
Merge: bd64c01 5479437
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 09:28:15 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/components/SpreadDrop/index.jsx
commit bd64c01ccec1e2ee37ad148b84aed1d064ae85d3
Merge: 7dfd62a b380174
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 09:20:27 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b3801745fb6938eb8bd727cc5b32ed7086dffdbd
Author: Luolei <16657115156@163.com>
Date: Thu Feb 21 20:15:51 2019 +0800
化验文字太长显示省略号
commit 33b3ef1bccc633bd90a57721429bcba5a4a71803
Author: Luolei <16657115156@163.com>
Date: Thu Feb 21 20:04:17 2019 +0800
ie滚动
commit 0de92f7a8175bb40e3ab8dc32b38ccc2b62d5cb4
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 19:17:48 2019 +0800
其他史查体提示bug修改
commit ad5200304ddeec1bc1cead1e49f550319b1feff8
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 19:04:44 2019 +0800
单选双击编辑删光后失焦存值bug修改
commit c1b9af5899a71f7398b2fd94a42770a59f77c7bc
Author: Luolei <16657115156@163.com>
Date: Thu Feb 21 18:59:06 2019 +0800
数字带单位弹窗问题
commit 7dfd62a2a867fd19a1ad80521c077eddd75bb484
Merge: b901e9e a599e98
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 18:43:39 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit b901e9ed954d6502578623c1f28ea9edfe83dfbd
Merge: b8b4174 a99d722
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 18:42:02 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/CheckBody/index.jsx
# src/containers/eleType.js
commit a99d722b957624438e91fb405418e8637f83f52f
Author: Luolei <16657115156@163.com>
Date: Thu Feb 21 18:32:09 2019 +0800
滚动条弹窗调整
commit ad1e46d28fbb2eeb3d894e82af6402aa8f4bf83e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 16:07:32 2019 +0800
数字组件事件优化
commit a599e98ab469a915bf759d3c08693ee313c13fa6
Merge: 0d67c39 b8b4174
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 15:03:38 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 0d67c39cf1c0cb0949f3e98869b660c5de42ebd3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 15:00:24 2019 +0800
修改治疗方案药物治疗类名字段
commit 27aced28537943a5b75cdaec24ad1f65ccec9477
Merge: bc555b0 b8b4174
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 13:40:18 2019 +0800
Merge branch 'dev/new1' into dev/otherHis
commit b8b4174d5b561c963a269b29d737eec0a58f6889
Merge: 27d6b1a e11a555
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 13:19:59 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 27d6b1aed64dbe80fe158dbe620f1c8f9ecda70f
Merge: 5ae0fe1 1a7645e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 13:19:36 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/store/reducers/checkBody.js
# src/store/types/checkBody.js
commit 5ae0fe1ebf36274d45e5a7d70709f655a54fa0be
Merge: 6af13c9 bfad6c4
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 09:46:23 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit e11a555129229f1ddb189c1a912f1d781270eac9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 09:45:41 2019 +0800
搜索结果去除诊断中已有诊断
commit bc555b0a62f3d06017256e567738e1796f254a82
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 09:41:47 2019 +0800
其他史删除不必要事件
commit 8638209c04be43066a35ad6fab211e92bbd637b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 20:03:29 2019 +0800
删除console
commit 08da5c25ae264534d19e3c4fa7c5e370b3e0d456
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 20:01:46 2019 +0800
诊断搜索添加同义词
commit 9f0f76b675ccb06b8cb0d3655680a238d7cc4ae3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 19:46:31 2019 +0800
ie8子标签灰显bug
commit 10ec058189f5bbee4d5dcb47a45001988ca3d870
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 19:28:05 2019 +0800
修改版本号和免责声明字体颜色
commit e627b67e63d6fa3c1d4faa9ab492c0bf4d8ee1c1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 19:22:48 2019 +0800
开单项没选择时，不跳到医嘱
commit c60e17b33180d7485a46ca9e98c0ed16c7775f2a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 18:32:50 2019 +0800
注释同类药物双击打开药品说明
commit bfad6c404134c5268b07a2c79f1f8a386f952bc8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 18:20:17 2019 +0800
诊断延迟搜索
commit 69b02c93e3b2afb26f44733c2ef9558e2852047e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 17:04:52 2019 +0800
查体既往史类事件处理添加
commit bdc074220b4d662818d430e56e7f9796efd06537
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:58:12 2019 +0800
其他史乙肝有高血压顺序勾选bug修改
commit 48abc323e58cf8f400c0371b5cdff14fdf54b4d9
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 16:57:11 2019 +0800
nothing to do
commit f6f6e023919d536dd60b746e6f3b0b3267c332c2
Merge: 3b8fdf4 6af13c9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 16:51:35 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 3b8fdf425f7cd93dbb736cfe8bcb90ac72b900bf
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 16:48:56 2019 +0800
通过ID搜索药品说明书（添加数据时查看药品说明书用）
commit 6af13c94c3cb901fbc0e49f77ecb45f1950b4fbc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:26:45 2019 +0800
翠加
commit e1af9c88f74e6483b81850953f1af2051040e677
Merge: 5ae9b8f 012bb7f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:21:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 5ae9b8fae1e7d1f56f160b6f2d621b8d6e53658d
Merge: 8decc9d 5b1feca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:21:38 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/common/components/SearchOption/index.jsx
# src/common/js/func.js
# src/components/CheckBody/index.jsx
# src/containers/CurrentIll.js
# src/store/async-actions/homePage.js
commit 8decc9d3e8255de2c81420a833e69582686aafdd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:19:15 2019 +0800
罗磊修改
commit 012bb7f0ea4d0ec66f313834b0e97beed46c028f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 16:17:54 2019 +0800
药品说明图标增加鼠标进入状态
commit c4ea61552060862a541493087ec096a413cbca2c
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 16:12:30 2019 +0800
高度计算有误
commit 50769d9e8a9845954a58145e5b7041b131729b67
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 15:59:38 2019 +0800
标点预览
commit 4a8b8a17d9b784225eaa07d67925752339418ee1
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 15:49:58 2019 +0800
滚动条问题
commit a4f1c2776effa4bfb1c9628d48cee2a755d8558b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 15:36:47 2019 +0800
诊断搜索增加搜索值为空情况
commit cd77c307ae34abe8cfb6fb53f235beb8f43d884d
Merge: ac44ed4 f7ec699
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 15:28:05 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit cee1138681863aa93e2374d48707171b294c0032
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 15:24:41 2019 +0800
预览行内样式部分修改到less中
commit ac44ed44fed7b42457e2dfc60b9ab13c97e0ced5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 15:06:10 2019 +0800
提示信息疾病详情页右侧菜单
commit 816fa09299c0177beac8573e50be4c86495a37f2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 14:59:20 2019 +0800
标点灰显bug修改，下拉对应标签高亮颜色修改
commit 3330385dd3ea7b2b419f5dbb92f05f8a20bc3c39
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 14:09:59 2019 +0800
标点符号跟前一个标签灰显黑显
commit b77a4e183b8413cbac1b663233b3382c7641857d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 13:43:26 2019 +0800
修改诊断搜索参数
commit b1f56da5d60d2944c4bbc8a8ccc61548f08b55e1
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 13:26:29 2019 +0800
纯标点符号不搜索，查体获取数据bug修改
commit d6849d30404fe7d3346909a7e10bc894d1f2ba33
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 11:39:43 2019 +0800
只有标点符号时不搜索
commit 4f7c951a117bec49fa853071847422a8dbf51e9a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 11:23:42 2019 +0800
单选组件双击编辑删完后失焦显示重复值bug修改
commit d771a09a5fc4e3e7af92e3ff3c85ed44975b2648
Merge: 28cd3ba f7ec699
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 11:13:20 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 28cd3bac18b0daa796f8a1a9292db3a24cb8e862
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 10:41:36 2019 +0800
主诉数组多个空格元素处理
commit 790d34dc38e886c3df1e67603922838f904e4ea7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 09:48:25 2019 +0800
药品说明书鼠标指向方式
commit f7ec699eb2b493c4bbbd0ee60194b639a6c8b8e8
Merge: 6c245fb 909ab25
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 09:43:41 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 6c245fb0901d2234a0aef7568039651dd4cdf91e
Merge: 96cc574 e36be2b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 09:43:15 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/common/components/SearchOption/index.jsx
# src/common/js/func.js
# src/common/less/variables.less
# src/components/Operation/index.jsx
# src/components/PreviewBody/index.jsx
# src/components/PushContainer/index.jsx
# src/components/SpreadDrop/index.jsx
# src/containers/CurrentIll.js
# src/store/async-actions/patInfo.js
# src/store/reducers/assistCheck.js
commit 197b0e5b453fa4446f71b728768baa67e5ab4700
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 09:42:48 2019 +0800
修改版本信息字体大小
commit 96cc574ab24f3da14e1f89610e6c5a1e451fa051
Merge: 5a2d97b fe9e87d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 09:35:47 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/common/less/variables.less
# src/components/PushContainer/index.jsx
# src/utils/tools.js
commit fe9e87d5e0735c356cc4041292dad4ce9cce18dc
Author: Luolei <16657115156@163.com>
Date: Tue Feb 19 17:30:38 2019 +0800
搜索为空清除列表数据
commit 909ab253717bafa4c9ffb3164441d8554e17ed03
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 17:27:10 2019 +0800
输入框添加行高
commit c870ce40e66ec3471bd8ab660346d41ca6374891
Merge: 82c0130 cb47bc5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 17:12:48 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 82c013012b1ec9adad9ea974c609c785bae349b2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 17:12:26 2019 +0800
删除console
commit 656a2e69d55a87696a52780074cdb97ebf72c3e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 17:03:22 2019 +0800
提示信息详情页弹窗显示
commit 94a46327141d7b22d245afbfef4908fca8b852df
Author: Luolei <16657115156@163.com>
Date: Tue Feb 19 15:50:52 2019 +0800
化验没有参考值正常显示
commit 5a2d97b0f644ef6172cce575e520ca3000cef9b0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 19 15:28:39 2019 +0800
ie8点开下拉未选值存值bug修改
commit 23f6f91a57f4c57826e5cd4adc6aea676a21751e
Author: Luolei <16657115156@163.com>
Date: Tue Feb 19 15:19:16 2019 +0800
1.ie8自动转换中文为unicode导致判断有误
2.阴影改为边框
3.主诉现病史删除得到数组里有空元素处理
commit 5e1184e69747c823a1ce3bba657332f1443f802b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 19 15:15:35 2019 +0800
回读无查体点击唤出模板
commit 48a9a00b3b5b31e499d32f8f6edbbda57390e721
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 19 14:30:22 2019 +0800
切换模式其他史数据bug
commit 4717362f96dd641518ca546c2b270a2c3f6d5002
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 19 11:38:42 2019 +0800
血压类文本子标签存值
commit 08f9160a8e26952c695d9563ece0cef09d7e6164
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 10:59:43 2019 +0800
清除移除患者信息缓存
commit cb47bc5b79d7f6e319a1b837d27012841925c678
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 17:16:42 2019 +0800
翠翠分支未合单独添加
commit 2a770d6266f8c7f5f0bd892befa6fa69166487bd
Merge: 3e68866 86e1d1d
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 17:14:17 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 3e688668bdaf2d376901cfa70a90a3587ad7ff69
Merge: dc08557 4f90da8
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 17:14:11 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit dc0855703def7c3a0c56c74d0b033b42657cb62e
Merge: 13db5c1 db268fc
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 17:14:02 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 4f90da88492079a14a3c167d364cc6b0160c668c
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 16:58:38 2019 +0800
弹窗关闭时机
commit 13db5c1cccec8c7f3ac5cb72d19aaf05a5bb63e4
Merge: 58cffc8 6e906e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 16:56:59 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 6e906e06753a119829e67db34a0e32e1c2d1a4db
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 16:23:12 2019 +0800
查体选中杂音血压选中状态bug修改
commit 1e57bc5dc0b63eaaa040d59d53c9f1a9409d2030
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 15:42:03 2019 +0800
单选组件下拉项可和名称相同
commit 9318dc730440ce833cd1317aed52699572208224
Merge: 58cffc8 db268fc
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 14:21:22 2019 +0800
Merge branch 'dev/byll' into dev/new1
commit db268fc6f4c11065e36e4405170bd08e667ce6fa
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 14:19:41 2019 +0800
ie8搜索单个文字删除报错问题
commit 86e1d1df0baee680a7c5bf99e8d6cbae4284c83c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 14:15:14 2019 +0800
治疗方案药品说明显示方式
commit 1391edf5cda27a44817030cb9fef6486da15b51e
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 14:14:41 2019 +0800
下拉框打开时标签边框蓝色
commit 758555c01c184adde48fb869909a1b9fdb77f4b1
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 13:50:39 2019 +0800
箭头函数传值性能问题修改
commit 8e25532ad88b1ca014acaaffb61155f3f62e8c64
Merge: 7a78823 58cffc8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 09:48:15 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 58cffc89d51661f2edbd21e1424fdd29afd590f9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 18:21:01 2019 +0800
上次提交回退
commit 4ca59db29b1a256c9b3015646301c0105cead455
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 18:13:57 2019 +0800
数字组件ie8输入报错参数无效bug修改
commit 5afd59399265b3a516e35317687946d2df551c9b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:59:35 2019 +0800
删除多余代码
commit d56b647e2f32fc9e5a50e58376d1677076b9c5c0
Merge: deb3340 e5ee60b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:57:54 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/containers/CurrentIll.js
# src/store/actions/mainSuit.js
commit 6c4e29739d3dbe45b1843f5a5fb2c054784d0739
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 16:55:03 2019 +0800
ie8右浮动不生效
commit deb33405ce270e3b1495e51fd537fa6d56f1a615
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:54:34 2019 +0800
免责声明弹窗层级bug修改
commit 15718f043d724dd440aab0d23c6eaf3cf54d2059
Merge: c2f5a1e 0ca5c1f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:34:51 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit c2f5a1e29bd29942c2faa59fd4fd645bbe50a814
Merge: a1c28c3 19f31f4
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:17:11 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/components/AddAssistCheck/Textarea/index.jsx
commit 0ca5c1f1aa7ce0b7c558cd53b0c4fc19ad096f90
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 16:13:59 2019 +0800
11
commit a1c28c3d77f4d5d27b7ec1ef0ceb1aaf8a6afdb4
Merge: 8bc39fc 3dbeabd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:13:41 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 3dbeabd15713010eb953dcee9c619e0cb4e89baa
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:10:56 2019 +0800
弹窗层级修改
commit b34feffbe308202a21d56c822371d5900e4d784c
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 15:53:02 2019 +0800
其他史无主诉第一次提示后不再提示bug修改
commit 541a45685981ece9caf11ef7ee13d871e1aaaf27
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 15:47:44 2019 +0800
搜索框下拉位置bug修改，杂音文字为多行时下拉遮挡文字bug修改
commit b9bb9cba1fe356d94bdc64a1caa4b60460bdef68
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 15:36:55 2019 +0800
复制内容样式乱掉问题解决
commit 9641e6a1c9fd1fefa66a4324401cf38d60e29cf3
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 14:37:35 2019 +0800
无殊选中状态遗留bug修改
commit 641c5762b7f7f98d532eb23fc97f881d33575222
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 14:18:44 2019 +0800
打印相关样式修改ie待测
commit e93c7c1557bee766ff94dfa4952cdf2f69c4e926
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 13:51:30 2019 +0800
用户信息banner不被下拉框遮挡，杂音选中样式修改
commit 64d1cffdb7e562263084ba5827df988a099ec7b7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 13:26:25 2019 +0800
杂音类型下拉样式优化
commit 08ab0d25e5c54f3535156e248de5063ff4454a2f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 11:31:31 2019 +0800
其他史查体tagType4类型搜索选中展开
commit a96e98a90f83c7d0e625f973b79cb65d33792623
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 10:48:50 2019 +0800
获取模板接口放在获取病人信息回调中，确保参数不为空
commit 19f31f4d19c841c9a0a86be849d749815e27a1c1
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 09:43:48 2019 +0800
修改标题点击enter问题
commit 8bc39fc836e6f24fc599d8d679164f7412ac71f3
Merge: 993eaf0 6fe34e5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 17:56:44 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/AddAssistCheck/index.jsx
# src/components/Inspect/index.less
# src/components/NumberDrop/index.jsx
# src/components/Operation/index.jsx
# src/store/actions/checkBody.js
# src/store/actions/mainSuit.js
# src/store/reducers/assistCheck.js
commit 993eaf02f2d5d2b0244587ed7096d1fcf9659465
Merge: 11260ee 6ca010f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 17:52:56 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 6ca010f83a2b882163bfaf3ee7f125f45e8d5ce3
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 17:36:47 2019 +0800
字体不一样，button问题
commit 8433d68d9027b2c31c5db2da33182c1507f08f9b
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 17:12:29 2019 +0800
更改中文冒号，修改辅检div样式，添加搜索ie8兼
commit 11260eeb9c9958368e933981df83e4e097a04c9d
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 17:08:07 2019 +0800
杂音类型双击编辑blur后重复输入值bug修改
commit 2911db7154036da7df72eb04b6e2a35b32c71106
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 16:48:08 2019 +0800
双击编辑前后缀bug修改
commit 6eef6a051d230f9f52a1df2ae6b5e3044c7b3505
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 16:33:58 2019 +0800
主诉-其他史组件双击编辑前后缀存值
commit 00f2e00fb09170526cd4101b320ece3b694e28f3
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 16:07:49 2019 +0800
查体数字组件双击编辑前后缀存值，血压类型标签双击编辑时不显示下拉框
commit 8019239ea85bf8e66de7adff69d1fcc9b94eb226
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 13:57:24 2019 +0800
修改ie8多[]bug
commit 70689ffbb3b43af0bcd21e0c6898855ede313faa
Merge: aca9d8f 3fe1212
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 11:36:41 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit aca9d8f6b118a3653050c6f59cbed645ac1b824d
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 11:19:43 2019 +0800
判断模板保存前后是否相同
commit a643a04284503f3491206a6da28f02e3b239bdfd
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 11:03:33 2019 +0800
打印保存判断问题
commit 665613f2a02a496e485917ee653ba58e4744fa7d
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 09:38:25 2019 +0800
写死参数更改
commit 3fe1212b9a37b328037ea87e8ed83b83bc71a5a6
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 17:56:33 2019 +0800
其他史提示无主诉时可输入bug修改
commit d895d0391f5389858501b5be2d98c93516740f1a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 17:29:35 2019 +0800
查体框可编辑状态删除
commit 0ea49aca9cfc5399c0d074c81fe7a330a76ed40b
Merge: 2799250 2facfcb
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 17:19:21 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/containers/eleType.js
# src/store/async-actions/treat.js
commit 2facfcb8073c095fa0b6ae3eb54566fb072d7c85
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 17:15:41 2019 +0800
查体获取数据失败时可输入bug修改
commit 141ab5430c47c52bcff13dc7d34cc5a7fa134d4c
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 15:12:53 2019 +0800
其他史查体搜索结果放前后bug修改
commit 9572b216a7c48e9947d3ce028b10f5849cb72102
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 14:34:34 2019 +0800
其他史搜索选中位置bug修改
commit ee5b7c3eb6a0e6328e2ee500deca54b756d69848
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 13:48:27 2019 +0800
搜索bug修改
commit c7e0483300e2188b162ce41063d38a50706979aa
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 16:34:50 2019 +0800
11
commit 7a7882300853f5a273686f709ab0462ad706a8f0
Merge: 420bcf7 2799250
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 15:28:00 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 27992500bd6cd1d92f6cc4411a8436f36ef565d0
Merge: 9573ac3 945c448
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 14:57:17 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit 9573ac3a696fa8e206e5a46e588dc4daad049381
Merge: c90d43b fbbb8fb
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 14:57:10 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit c90d43b677ba6dbaad86bd1fc8d4731eb46165b5
Merge: d2c86ef 81e413f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 14:56:09 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/containers/OtherHistory.js
commit 81e413f1f4296fc8bcc22485e5779ddb776478f1
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 14:53:45 2019 +0800
之前修改的bug找回
commit 420bcf750b1e316f23b750de4985441221ef0a5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 14:53:11 2019 +0800
修改同类药物样式
commit 3bf089d9605e75bf7511e9d42fa6b03c9c6066b1
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 14:44:35 2019 +0800
改为全局弹窗显示
commit fbbb8fbbb040b404ee7307b1b95505cea783626a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 14:38:23 2019 +0800
修改添加诊断推送
commit e1240a8e9f409aa5e4382e2bc0ef63ed6ff0a1dd
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 14:20:22 2019 +0800
弹窗高度动态设置
commit d2c86efb89cba523db9c587e7d8435a4b2be8531
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 11:16:53 2019 +0800
无选中项体温输入bug修改
commit aa6d15a7c141f10f275f1fc470d0eba476ffc4b2
Merge: 9f91346 1fccd43
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:57:06 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 9f91346e73a2a64ce463baf32723a8c9e3b9cc05
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:55:41 2019 +0800
bug修改
commit 1fccd439ee53729685732eeb6fbbfe1be0eda80d
Merge: 986a3cf 2e25c1b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 09:58:11 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 3385c2c2a41d0b223136f5f176487cce09e1c082
Merge: b876b6b 2e25c1b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 09:51:36 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/otherHis
# Conflicts:
# src/store/async-actions/treat.js
commit e697f350f7724505282d06dfa0dc2ae001ea9c09
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 09:46:57 2019 +0800
删除console
commit 2e25c1bb7076358b6e4063ced5731c3f456eb704
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 09:40:43 2019 +0800
诊断第一个为复诊添加到主诉
commit 986a3cf5976bfec9bce6afb554bab1f4a1a2a49d
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 17:33:59 2019 +0800
合并
commit c900ae632d99d0c0fb2e2e5f9788707ada02745a
Merge: 31ef38b b7bfe2b
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 17:18:38 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/CopyRight/index.less
# src/components/DiagnosticList/index.jsx
# src/components/Inspect/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/components/Operation/index.jsx
# src/components/PushContainer/index.jsx
# src/components/Treat/index.jsx
# src/components/Treat/index.less
# src/containers/NumberUnitDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/diagnosticList.js
# src/store/async-actions/treat.js
# src/utils/tools.js
commit 31ef38b3d5b46612b64866687214c2b9d1651b03
Merge: 44fbf2b d6751d9
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 17:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddInspect/index.jsx
# src/components/CopyRight/index.less
# src/components/DiagnosticList/index.jsx
# src/components/Inspect/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/components/Operation/index.jsx
# src/components/PushContainer/index.jsx
# src/components/PushItems/index.less
# src/components/SpreadDrop/index.jsx
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/utils/tools.js
commit 44fbf2b8d8f90640a9af8abe4da55c2af7efa319
Merge: db4e755 935c0cf
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 15:52:43 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/components/PreviewBody/index.jsx
commit db4e7559fb2bc15434058503ca8d1a1e3ffe8ad6
Merge: edb84b0 9483642
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 15:44:26 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/components/TreatDesc/DrugInfo/index.less
# src/store/async-actions/treat.js
# src/store/reducers/treat.js
commit edb84b07adad34cdd5c94a592e543127d20eaec1
Merge: b876b6b 6b71cd5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 15:35:50 2019 +0800
更新
commit b876b6b8dc6afe12ae2a90c990d147e32221d02c
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 14:38:05 2019 +0800
其他史有伴无排序
commit f8ab9c103e8266a6ab44466a7fadbc1f0a91ceca
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 14:06:33 2019 +0800
查体搜索自由文本位置bug修改
commit e45296e22263659c86f60d031bc5246c7f1be726
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 13:51:40 2019 +0800
复诊主诉文本模式bug
commit f5cae58692247cad7c0b3ff8966a2f7d5213069c
Merge: 960317d d3e160a
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 13:39:27 2019 +0800
Merge branch 'dev/new1' into dev/otherHis
# Conflicts:
# src/components/SpreadDrop/index.jsx
commit 960317de925978075041b722cd3500488ce924fd
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 13:36:13 2019 +0800
双击隐藏下拉
commit 06571b04a337a3805d723e22e964c5ba683293f5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 10:28:18 2019 +0800
主诉saveText无值则判断为空，查体其他史聚焦提示
commit 94836425d1dc9b9cf5cc1f2ce6f3bdc3706fd578
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 19:50:58 2019 +0800
修改版本信息样式
commit e0092d7003c2bcfecc38a77350d29ddc1a92dbf2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 19:40:32 2019 +0800
关闭药品说明书时清除内容
commit a921420ddd0b8c4c8101b1d5bb1d7fec8e422341
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 19:01:15 2019 +0800
修改治疗方案和药品说明书样式
commit 935c0cf687389a50aeef502b97f07685e675bd1d
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 17:16:52 2019 +0800
滚动兼容
commit 6b71cd51bbafd8c4283b1c16fae3a538a88f5651
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:54:56 2019 +0800
现病史病程变化
commit 91c3713c62e8eb4b9437b00d754133e87561d8cc
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:36:48 2019 +0800
注释scrollTo
commit 2123a1e9839af1052e1405d6a005ddf521041c9d
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:10:44 2019 +0800
Squashed commit of the following:
commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 16:00:51 2019 +0800
打印医生签名自动获取
commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 14:09:41 2019 +0800
样式调整
commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 14:02:27 2019 +0800
化验填写单清空按钮，弹窗还在
commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 13:46:36 2019 +0800
模板列表获取时机
commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 13:34:03 2019 +0800
模板名称重复弹窗不关闭
commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 10:46:13 2019 +0800
模板保存跟之前所有保存的模板作对比
commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:35:01 2019 +0800
底部几个按钮换行设置最小宽度
commit 7400613a1eb642e1d01004c7818883fd73c2350c
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:28:45 2019 +0800
历史病例时间和按钮不能共存
commit eda3f4b08a3460360541cd2af1c2ca071681c595
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:12:47 2019 +0800
bug修改
commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 15:54:49 2019 +0800
还是符号处理...
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
# Conflicts:
# src/utils/tools.js
commit 6df92ea9ddd29c14979874f2f0e7eac54d032eaf
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:07:27 2019 +0800
Squashed commit of the following:
commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 15:20:06 2019 +0800
治疗方案样式
commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 15:18:20 2019 +0800
修改治疗方案样式
commit 859a7364a96569f6aa92360efbce5a19b40681cb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:32:44 2019 +0800
修改治疗方案小标题样式
commit 99789b23f06c18e5b588552066faf7f2ccacf198
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:07:48 2019 +0800
修改治疗方案同类药物
commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:00:40 2019 +0800
修改弹窗IE8不居中
commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 20:30:39 2019 +0800
治疗方案高度自适应
commit c000d83fb6ac5f265951c0e1377b627d24d2da10
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 17:27:30 2019 +0800
修改治疗方案边框
commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:58:28 2019 +0800
导入化验结果，第一次添加诊断为主诉时不往主诉添加字符串
commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:56:03 2019 +0800
治疗方案标题添加疾病名称
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
# Conflicts:
# src/components/Treat/index.jsx
# src/components/Treat/index.less
# src/store/async-actions/diagnosticList.js
# src/store/async-actions/treat.js
commit 20f96c311119b635dad33f6c9222d94d8563bbfe
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:02:31 2019 +0800
Squashed commit of the following:
commit 27178b569e9575d450bbf1ce329e069d4c4b4b8c
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 15:57:20 2019 +0800
ie8现病史添加症状报错的问题&查体血压选中不变黑的问题
commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 18:17:15 2019 +0800
查体模板添加逗号，主诉两个时间处理
Squashed commit of the following:
commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:51:09 2019 +0800
Squashed commit of the following:
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit fea9a721ccb5afb9f1873c2111e3722d7330d394
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:50:07 2019 +0800
Squashed commit of the following:
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
# Conflicts:
# src/components/PushItems/index.jsx
commit 2c70e41e7a5254838436b499b1ad787f523585f8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:42:54 2019 +0800
Squashed commit of the following:
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/NumberDrop/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/store/actions/mainSuit.js
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/PushItems/index.jsx
# src/utils/tools.js
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
# Conflicts:
# src/containers/NumberUnitDrop.js
# src/store/actions/checkBody.js
commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 16:00:51 2019 +0800
打印医生签名自动获取
commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 15:20:06 2019 +0800
治疗方案样式
commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 15:18:20 2019 +0800
修改治疗方案样式
commit 859a7364a96569f6aa92360efbce5a19b40681cb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:32:44 2019 +0800
修改治疗方案小标题样式
commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 14:09:41 2019 +0800
样式调整
commit 99789b23f06c18e5b588552066faf7f2ccacf198
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:07:48 2019 +0800
修改治疗方案同类药物
commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 14:02:27 2019 +0800
化验填写单清空按钮，弹窗还在
commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:00:40 2019 +0800
修改弹窗IE8不居中
commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 13:46:36 2019 +0800
模板列表获取时机
commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 13:34:03 2019 +0800
模板名称重复弹窗不关闭
commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 10:46:13 2019 +0800
模板保存跟之前所有保存的模板作对比
commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 20:30:39 2019 +0800
治疗方案高度自适应
commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 18:20:27 2019 +0800
Squashed commit of the following:
commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 18:17:15 2019 +0800
查体模板添加逗号，主诉两个时间处理
Squashed commit of the following:
commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:51:09 2019 +0800
Squashed commit of the following:
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit fea9a721ccb5afb9f1873c2111e3722d7330d394
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:50:07 2019 +0800
Squashed commit of the following:
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
# Conflicts:
# src/components/PushItems/index.jsx
commit 2c70e41e7a5254838436b499b1ad787f523585f8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:42:54 2019 +0800
Squashed commit of the following:
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/NumberDrop/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/store/actions/mainSuit.js
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/PushItems/index.jsx
# src/utils/tools.js
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:35:01 2019 +0800
底部几个按钮换行设置最小宽度
commit 7400613a1eb642e1d01004c7818883fd73c2350c
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:28:45 2019 +0800
历史病例时间和按钮不能共存
commit c000d83fb6ac5f265951c0e1377b627d24d2da10
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 17:27:30 2019 +0800
修改治疗方案边框
commit eda3f4b08a3460360541cd2af1c2ca071681c595
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:12:47 2019 +0800
bug修改
commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 15:54:49 2019 +0800
还是符号处理...
commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:58:28 2019 +0800
导入化验结果，第一次添加诊断为主诉时不往主诉添加字符串
commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:56:03 2019 +0800
治疗方案标题添加疾病名称
commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:51:09 2019 +0800
Squashed commit of the following:
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit fea9a721ccb5afb9f1873c2111e3722d7330d394
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:50:07 2019 +0800
Squashed commit of the following:
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
# Conflicts:
# src/components/PushItems/index.jsx
commit 2c70e41e7a5254838436b499b1ad787f523585f8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:42:54 2019 +0800
Squashed commit of the following:
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/NumberDrop/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/store/actions/mainSuit.js
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d6751d916bd9aff60373a28ce2240bc078809e9a
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 09:51:31 2019 +0800
合并new1分支
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit caad36f002904aa859a0d780eefdf5b9cdc9011e
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 11:24:02 2019 +0800
时间单位组件IE兼容
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit 58e0fdd1ab99664163923ff7ae455efff5850195
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 09:20:30 2019 +0800
主诉IE兼容性处理
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit f353eaef8074a17ee8977dd3ac1f9cf7685e713e
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 09:32:28 2019 +0800
Squashed commit of the following:
commit 70e968a78a10c520fa092cd979e0e03475523dc4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Mar 4 09:25:57 2019 +0800
修改诊断搜索参数
commit 77ca8b29d1fc647e6765ebe0330b52ea88bd606f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 18:12:20 2019 +0800
合并错误修改
commit a20149638473c75479c56deb365db7c328a558cb
Merge: cfc64ea 6b7dfbb
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 18:08:43 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/store/async-actions/homePage.js
commit cfc64eaaaf0c98941c04be7b355aa646ecb3c560
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:27:09 2019 +0800
标点加英问号
commit 6b7dfbb33bd85d54dff60649f913b2fef6f8ce0c
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 17:24:55 2019 +0800
bug提交
commit 35a9c17b604893b2d97c45143128e5ea4d8d15bc
Merge: 11d0086 a0beff1
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:17:00 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit 11d00865399c3ba8bf5afe096ca3f3856c86be36
Merge: 4f214b2 422c5cf
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:16:54 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/components/DiagResultSearch/index.jsx
commit 4f214b2a23fd9bacb6671e191f7e42544c7b87af
Merge: c721d35 9378eb8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:15:36 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c721d35ada039c262724106b4b8d0342573e36ec
Merge: b8f144b 0f0c391
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 17:15:32 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 9378eb8bfca2571b7ed6e83560f2decaded45f2c
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 16:55:33 2019 +0800
其他史selecteds为空bug修改
commit f6fec4a2b2f25e1b8d89b62601baa63a2cefe968
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 16:38:02 2019 +0800
修改清空后第一次点击键盘不触发click事件bug
commit c11b47d06e11c024a17f02b5648a800405d88ff5
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 10:28:17 2019 +0800
其他史文本模式数据bug修改
commit 422c5cfdfaa0312d65cce2c717de1f1b2f63755b
Merge: b479e52 b8f144b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 10:25:45 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit b479e52191221be49d4417308014517a821d8d41
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 10:21:39 2019 +0800
修改诊断搜索
commit b8f144b7c2c1fb60d208525d29dc1a1a38280edb
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Mar 1 09:44:49 2019 +0800
去重标点添加
commit 345ea481613f2fe5beb8aacdc117ce022a60f1b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Mar 1 09:23:31 2019 +0800
修改常用药物慎用标识透明度
commit 0f0c3911304b587351e1d53627a9f1a314f9173a
Author: Luolei <16657115156@163.com>
Date: Fri Mar 1 09:08:54 2019 +0800
11
commit 58d128cb772f05fbf90974b0187ce2fa91905f76
Merge: 5ec2c5b 21e2bf6
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:28:55 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 5ec2c5be9b99f40fd7322ea4299a8ef5ddbfbf5a
Merge: e3965b6 f388f66
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:28:51 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit e3965b6f49b9325a9a6aa6f9e3382d8e6be8b6b9
Merge: ba2209b b37ea33
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:28:18 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit ba2209baa70ce98557956e4ee5e24659537b4e41
Merge: c7033dc 2fc00bd
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 20:22:41 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2fc00bd2a0c2c83d0b3a763147a5196f36ed2513
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 17:56:22 2019 +0800
病例滚动条上面不遮挡导入按钮上移
commit 21e2bf63e19461fc8956c991678d11ada4abad61
Merge: 56412f4 c7033dc
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 28 15:49:11 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 56412f467c018e2ce22415a54a36be230126b5fe
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 28 15:47:21 2019 +0800
注释查看药品说明书
commit 7a306c9f203aa3e7c67a6c2138adbe2602b9aa56
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 15:44:55 2019 +0800
修改其他史查体杂音类选中bug
commit f388f660e2062b82ac39984f21bcd1603982f911
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 12:28:02 2019 +0800
1
commit c7033dc0fa9b576fd44ad580a70d9dc3c9abbc21
Merge: 24781b3 9b8aba5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 12:26:47 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 24781b351a21c98c7f0185b808c6cb2c8459cab8
Merge: dd471cd 686d0e6
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 12:26:41 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit dd471cd31cd4f5e8bee1cc4394afc2d1ec645d27
Merge: fdfd012 beee05d
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 12:26:32 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit fdfd0120716eea088da637b233700b07e6865f53
Merge: 47805f3 6c7eff1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 28 12:26:16 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 6c7eff13a7a93e7e50d569a72155a280973c1053
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 09:59:02 2019 +0800
excel导入日期时间戳格式转换
commit 92eb95e4a13cc141cf115fd59ba96eb9c4ad81f8
Author: Luolei <16657115156@163.com>
Date: Thu Feb 28 09:35:49 2019 +0800
化验清空只清空数据
commit 9b8aba56d77ce741849edf60453f395ec7a17959
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 17:00:35 2019 +0800
清空后其他史杂音类选中状态bug修改
commit cca4e2b37197823231e6cbe1407b93ab2c1cb49e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:38:03 2019 +0800
标点补充
commit 686d0e6888cbe437c6126b079f546c5a7b811ae7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 16:34:13 2019 +0800
点击开单项到医嘱
commit 47805f396f0acda35a73a8fbe23a2b290af60a84
Merge: dbfbe54 0ab03d2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:20:13 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit dbfbe549b65f8dea75579b10e02d7a4d022929a2
Merge: ba95b15 24a72ee
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:20:08 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit ba95b154cd8f0acb6ac3cbdd0f56c2b5cd128a51
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:17:59 2019 +0800
主诉合并错误修改
commit 545d910e9331f21ab16be77ab7ac326ad3de580d
Merge: a261f0c 48728c3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 16:15:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/MainSuit/index.jsx
# src/components/PreviewBody/index.jsx
# src/components/PrintPreview/index.jsx
# src/components/TreatDesc/DrugInfo/index.jsx
# src/store/actions/diagnosticList.js
# src/store/actions/otherHistory.js
# src/store/reducers/assistCheck.js
# src/store/reducers/otherHistory.js
commit 6b6082ca9ad86cab359874b6089815719b51d7d4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 16:04:10 2019 +0800
Revert "第一个诊断为复诊添加到诊断调用推送接口"
This reverts commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d.
commit a261f0c60ae06808381dd443b5d8cef42760d953
Merge: f2cb210 7e81b63
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:58:46 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 0ab03d2eba0865ebdda8c8b9eb84e5dea7f07b59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:53:28 2019 +0800
标点规则：中间连续标点保留第一个，开头去掉，结尾保留第一个，灰色不显示
commit 24a72eec3ae4dbbf47d32e5156c2c66c300a129d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 15:40:32 2019 +0800
第一个诊断为复诊添加到诊断调用推送接口
commit cd02a522c6054deb9ade0fed202338dd1ce9021b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:26:16 2019 +0800
输入再删除输入不搜索bug修改
commit e62e0aa6083ed13edbbfc36124ff79363ddaba38
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:16:58 2019 +0800
推送参数加主诉
commit 134276afd973d5b5d8e07389cee27eb9391e9247
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 15:14:00 2019 +0800
双击编辑状态关闭bug
commit 769c60daabd81ef48f37f5227e9a55fb205ce5ee
Author: Luolei <16657115156@163.com>
Date: Wed Feb 27 14:11:43 2019 +0800
化验颜色不一致
commit e3ad8a2d18a21cc770b9c303d92146bbe78e4d8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 14:10:40 2019 +0800
有选中无殊未灰bug修改
commit 581c9dbc6f714c5e795a45102cb095cf84738522
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 27 14:04:07 2019 +0800
杂音类单选bug修改
commit 20a3edfe13f4c24c2748758f28bd488aa2ca6ea1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 27 09:37:07 2019 +0800
推荐检查项没内容时，开单按钮置灰
commit 970c4d7db52af55f2e9d39ce3401289683a8f297
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 17:39:35 2019 +0800
常用药物治疗添加类名置灰状态
commit 7e81b634b0952dc237048ee99f41364e360cea84
Author: Luolei <16657115156@163.com>
Date: Tue Feb 26 17:38:04 2019 +0800
清除添加化验辅按钮浮动，打印医生名字位置，辅检标题小屏幕换行，模板接口进入页面没有调用问题
commit f2cb21089d2c321a9cc6b5e666627c6a75e275db
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 17:25:29 2019 +0800
数字键盘在组合中样式bug修改
commit dd03327ec3396302fb66f3f60f7b24c0ff730e6c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 16:53:48 2019 +0800
点击开单聚焦到医嘱
commit 179d7080d06e284ed973d59c5a76ed3dc6a26daf
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 16:43:01 2019 +0800
重复修改，回退
commit 7beb5f11bab81ae4535eaf2e61136ab71d06e0aa
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 16:41:17 2019 +0800
修改1024样式bug
commit 7ad8183615802729dc3bbb6507c864a376e79bb6
Merge: fca4a15 66e5e26
Author: Luolei <16657115156@163.com>
Date: Tue Feb 26 16:07:59 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit fca4a15e3ab974f4c684496f43f76afa606a23bc
Author: Luolei <16657115156@163.com>
Date: Tue Feb 26 16:06:12 2019 +0800
回读div里的模拟placeholder清空，辅检出现两次，模板列表为空高度问题，火狐div清空还有个换行符去掉
commit 66e5e26b6541d8923222f43852e56d91252a1c84
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 15:20:20 2019 +0800
修改提示信息疾病说明菜单按钮光标形状
commit ef15ad95e416155b911c474742cf526bbad9b041
Merge: c051e01 8911ac8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 15:15:58 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit c051e0198219bc143a535bac13afa3dfcd90696c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 15:14:39 2019 +0800
药品说明书多个Id查询
commit 8911ac8887de34bdef955a59462f260fc2c6962b
Merge: d31a749 37f085a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 13:19:19 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit d31a749c48b6f6b1e6725575fd09f84f71ebfd9b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 13:19:06 2019 +0800
搜索后加标点测回
commit 30000aad93762077ef746ef683fd2a47c14b3853
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 11:22:11 2019 +0800
其他史查体搜索的标签后加逗号
commit 37f085a3d788fd707c76bca36d9cd714f0d03742
Merge: 9112336 13dce94
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 11:17:23 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 9112336c27d8e2c1c143b75b8d8bf03f85b528f1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 11:16:40 2019 +0800
修改推送添加到诊断
commit 13dce94fec6b39d0ddf4d0b0322bd84fadddc860
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 26 10:14:36 2019 +0800
1024合并bug修改
commit d1cb01259d8eab3933cd5166c6e39c6e9ec85516
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 10:12:56 2019 +0800
同类药判断添加名称判断（有的同类药id为null）
commit 536ab1e7dc67936fa9a586f8d55ad1c6d2ee60ba
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:41:41 2019 +0800
修改药品说明书标题宽度
commit c855d6416f7509f8ac7d6cb437790a11ad8d93d9
Merge: feceb08 25a000f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:41:03 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 25a000f38ba5cdfb6fdb174c54341f9b058f2dd7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:40:26 2019 +0800
Revert "修改药品说明书标题宽度"
This reverts commit 576b54554b36e37ea0eb80e815ad381772b19cc5.
commit 576b54554b36e37ea0eb80e815ad381772b19cc5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 26 09:38:52 2019 +0800
修改药品说明书标题宽度
commit 51a04b0d5f4f7124e9ae63240a32ed39b945f50b
Merge: 644d713 0236d09
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:19:58 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 644d7138c63af93af0e0286644367726d3da2ba0
Merge: fa1380f c7236c8
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:19:37 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7236c894382e11b0a4051f097643e857bf8f065
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:19:06 2019 +0800
两边对齐火狐兼容
commit fa1380f7bafb00efe15a3c1e487f162f2594a913
Merge: e0bc863 96ced84
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:12:10 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit feceb083da47d70c70db09cc69ce6359e907ecb2
Merge: 0236d09 e0bc863
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 20:10:43 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 0236d096817f2a3b0b04a67a3a44b3394014e267
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 20:01:41 2019 +0800
药品禁用状态i图标不置灰
commit 96ced84b7cd01fecf31a546ef58a2375bdfb2e37
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 20:00:10 2019 +0800
说明书标题去空格
commit a073a592d34258a699b123e4dec909cc0c4c73a8
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:52:14 2019 +0800
药品说明书排版
commit e0bc863cca36de3ab8f8398352f72642780728d9
Merge: 853319f 3fd13c2
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:18:29 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 3fd13c27d56310fc94d46f4e14f374a4de4dd8fa
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:18:02 2019 +0800
数字框蓝色背景显示修改
commit 853319fd0394943edd4945e24701e837f71cf1ac
Merge: 6211dfd 07d7ab9
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:14:47 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 07d7ab98655cbe928b1ac037bcd3889e59918dbb
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 19:14:09 2019 +0800
数字键盘输入优化，bug修改
commit 6211dfdbb509b4fa4b555899887b119e2333ef41
Merge: ca9f83c 4c41407
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 18:36:49 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit ca9f83c2e9296cb408f91cd53cdf7eae22a39993
Merge: 2897015 d8fc333
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 18:35:58 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/utils/tools.js
commit d8fc333a180f46d4b4fad31cd39e1362e3b1f206
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 18:17:49 2019 +0800
火狐placeholder模拟
commit 4c414071774ef37e1ac57739d72e4b35e8456a8d
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 17:43:26 2019 +0800
双击删除标签时删除后面的标点
commit 2897015cc3d9fd4bc687c88de707a965d30f1f80
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 17:07:24 2019 +0800
清空等条件判断
commit 298014e4aefc250ce60555d316be355b469abad5
Merge: d8b2728 54ed95b
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 16:55:02 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/EMRContainer/index.less
# src/components/MainSuit/index.jsx
# src/components/Operation/index.jsx
# src/components/Operation/index.less
commit d8b2728b1c4484c4327ea2fd1c5be54a87e802f5
Merge: 827b9fe 6ff3c2f
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 16:49:36 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 6ff3c2f91b7a21f20081c4feb7cdbeb0fe94f61b
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 16:46:01 2019 +0800
性别判断提示位置更改
commit 827b9feb46ed370019aef767270dc98240a3a60d
Merge: 3164918 f18aff0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 16:21:51 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit f18aff0c73b774231f1894446b877e67f7bf1bcf
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 16:15:52 2019 +0800
其他史数据判断补充
commit 3164918c9c57afd13cd89077ee356ed0541458f0
Merge: a3c6497 0adcc7b
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 15:42:23 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 0adcc7bf5f39b10a3c2254cf1633d9ffd05e6073
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 15:40:14 2019 +0800
数据判断有误
commit a3c649762af9a4d8b66db4f678e62c708cca301b
Merge: af35906 fa664ff
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 15:12:20 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/components/PushContainer/index.less
commit af359067b1d3c08d5329f89ab0565d9eeaa8d49d
Merge: 4785b29 c33cd61
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 15:06:45 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c33cd619b6aca13ec5a5fadbe66bfe4b71f5ed81
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 14:51:06 2019 +0800
双击编辑蓝色边框
commit 4785b29ea0eb3c58b5f508ddf9e2a65fd5b96247
Merge: 942579e e665919
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 13:41:56 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/components/PreviewBody/index.less
commit e6659190bc72350a2b1848d30d1098aa61f29849
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 13:37:52 2019 +0800
模板部分滚动条显示出来
commit 942579e843fef29e00e4764d4acac312a51496ec
Merge: 2b7ce81 7a014d0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 13:35:56 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 7a014d0d797d7e90f88a8d0f939c9845096b0411
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 13:35:18 2019 +0800
有糖尿病bug修改
commit a66f41acdd18acfa5dd6343178571743f1193226
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 13:32:44 2019 +0800
其他史查体回读bug修改
commit fa664ffcfa65bd1438999b0f9e79f99c80f7d531
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 11:30:05 2019 +0800
删除诊断没有id时（添加名称判断）
commit 86720794a59da37c8700f72e96740bcdf1906dc8
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 11:27:23 2019 +0800
bug
commit 3de2cf0c7fae1a0f1a994ee604f696d1f64c191e
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 11:09:44 2019 +0800
1024下历史病例显示问题，清空主诉聚焦不在span
commit 3f9e94c357e549318c1e79a04842a4c477d58974
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 25 10:03:29 2019 +0800
pushContainer添加定位信息
commit ec0a210bc616de96a0ed48df41300fcf95f6b1f3
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 10:02:01 2019 +0800
预览宽度有误
commit 2b7ce81ae4a157abf013f3b2f156b5d280f9403e
Merge: 78fe295 de5b6f2
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 25 09:52:32 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/components/OtherHistory/index.jsx
# src/components/PreviewBody/index.jsx
commit de5b6f2da0953c8bce31d166490d633f5c8d39c4
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 09:41:50 2019 +0800
模板男女弹窗样式调整
commit b2b959689c9b48b7e82b07766b7320952d649dbd
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 09:25:31 2019 +0800
弹窗高度动态变化
commit a2006f9c3a15df6225e8f5664e3f8330e9def1b7
Author: Luolei <16657115156@163.com>
Date: Mon Feb 25 09:22:25 2019 +0800
弹窗宽度变化
commit c6d4ec0ba654f8ed6d25c92f592c11fa8dfc0491
Author: Luolei <16657115156@163.com>
Date: Sun Feb 24 16:51:25 2019 +0800
bug
commit 8bfb380ec8366c43dbd2d3a0078ccc9f13816d62
Author: Luolei <16657115156@163.com>
Date: Sun Feb 24 11:10:18 2019 +0800
连续两个句号处理
commit fb65e9d6a4af98dcfafc8008963a59e9ef368dbb
Author: Luolei <16657115156@163.com>
Date: Sun Feb 24 10:45:55 2019 +0800
判断是否为空只判断文本不判断结构
commit 1749ad61e39543920defb0e8be1d7ce61a03a7bb
Author: Luolei <16657115156@163.com>
Date: Sun Feb 24 10:34:52 2019 +0800
男女模板区分
commit ef798e435a077495c1e84d3ca6893a7e78470119
Author: Luolei <16657115156@163.com>
Date: Fri Feb 22 17:28:30 2019 +0800
模板性别
commit 78fe295b3e69c7e7720b73ea67d3ffcc347f8554
Merge: d5b22a1 3abdfe7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 17:25:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit d5b22a1659068387f4fd1cd0a76d10da296f9511
Merge: 52a81ab e073408
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 17:24:55 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/CheckBody/index.jsx
# src/components/MainSuit/index.jsx
# src/components/SpreadDrop/index.jsx
commit 52a81abd66ca014880035ac04d229f22c54f9768
Merge: 6b572c4 b133db8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 17:16:29 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 3abdfe7396e7375d4d9a5fbafe0d11705494a101
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 16:35:13 2019 +0800
其他史查体删到只剩一个文本标签时整行可落光标
commit 65bf32b0cedb716f36c2d9bcba9cc79993a35cbc
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 16:24:27 2019 +0800
删除多余代码
commit 333360a86405a53dc566e1db80812c62e9ada9df
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 16:18:58 2019 +0800
其他史查体提示优化，未获取到数据的情况优化
commit b133db8b2ebe68183f0fca8a934b79e037ab2702
Author: Luolei <16657115156@163.com>
Date: Fri Feb 22 15:14:08 2019 +0800
11
commit 6b572c48f1c7b75e669aa328ab8d0c8271cd6a5f
Merge: d7668cb 3131b2d
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 15:12:02 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 3131b2d66e39cb5df50b50a1512f3b3d7878cc83
Author: Luolei <16657115156@163.com>
Date: Fri Feb 22 10:56:58 2019 +0800
主诉搜索框位置
commit d7668cbc0bb1a57218083423f483367f6b6a1bbd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 10:13:02 2019 +0800
杂音类变量串bug
commit 5ef7897748fe81cfc3a1e9e30a9cad9eb8576fac
Merge: 77daf9d 0de92f7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 09:46:01 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/components/NumberDrop/index.jsx
commit 77daf9d197cf583de16612dbc20339502081545f
Merge: bd64c01 5479437
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 09:28:15 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/components/SpreadDrop/index.jsx
commit bd64c01ccec1e2ee37ad148b84aed1d064ae85d3
Merge: 7dfd62a b380174
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 22 09:20:27 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b3801745fb6938eb8bd727cc5b32ed7086dffdbd
Author: Luolei <16657115156@163.com>
Date: Thu Feb 21 20:15:51 2019 +0800
化验文字太长显示省略号
commit 33b3ef1bccc633bd90a57721429bcba5a4a71803
Author: Luolei <16657115156@163.com>
Date: Thu Feb 21 20:04:17 2019 +0800
ie滚动
commit 0de92f7a8175bb40e3ab8dc32b38ccc2b62d5cb4
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 19:17:48 2019 +0800
其他史查体提示bug修改
commit ad5200304ddeec1bc1cead1e49f550319b1feff8
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 19:04:44 2019 +0800
单选双击编辑删光后失焦存值bug修改
commit c1b9af5899a71f7398b2fd94a42770a59f77c7bc
Author: Luolei <16657115156@163.com>
Date: Thu Feb 21 18:59:06 2019 +0800
数字带单位弹窗问题
commit 7dfd62a2a867fd19a1ad80521c077eddd75bb484
Merge: b901e9e a599e98
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 18:43:39 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit b901e9ed954d6502578623c1f28ea9edfe83dfbd
Merge: b8b4174 a99d722
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 18:42:02 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/CheckBody/index.jsx
# src/containers/eleType.js
commit a99d722b957624438e91fb405418e8637f83f52f
Author: Luolei <16657115156@163.com>
Date: Thu Feb 21 18:32:09 2019 +0800
滚动条弹窗调整
commit ad1e46d28fbb2eeb3d894e82af6402aa8f4bf83e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 16:07:32 2019 +0800
数字组件事件优化
commit a599e98ab469a915bf759d3c08693ee313c13fa6
Merge: 0d67c39 b8b4174
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 15:03:38 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 0d67c39cf1c0cb0949f3e98869b660c5de42ebd3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 15:00:24 2019 +0800
修改治疗方案药物治疗类名字段
commit 27aced28537943a5b75cdaec24ad1f65ccec9477
Merge: bc555b0 b8b4174
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 13:40:18 2019 +0800
Merge branch 'dev/new1' into dev/otherHis
commit b8b4174d5b561c963a269b29d737eec0a58f6889
Merge: 27d6b1a e11a555
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 13:19:59 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 27d6b1aed64dbe80fe158dbe620f1c8f9ecda70f
Merge: 5ae0fe1 1a7645e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 13:19:36 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/store/reducers/checkBody.js
# src/store/types/checkBody.js
commit 5ae0fe1ebf36274d45e5a7d70709f655a54fa0be
Merge: 6af13c9 bfad6c4
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 09:46:23 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit e11a555129229f1ddb189c1a912f1d781270eac9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Feb 21 09:45:41 2019 +0800
搜索结果去除诊断中已有诊断
commit bc555b0a62f3d06017256e567738e1796f254a82
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 21 09:41:47 2019 +0800
其他史删除不必要事件
commit 8638209c04be43066a35ad6fab211e92bbd637b7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 20:03:29 2019 +0800
删除console
commit 08da5c25ae264534d19e3c4fa7c5e370b3e0d456
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 20:01:46 2019 +0800
诊断搜索添加同义词
commit 9f0f76b675ccb06b8cb0d3655680a238d7cc4ae3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 19:46:31 2019 +0800
ie8子标签灰显bug
commit 10ec058189f5bbee4d5dcb47a45001988ca3d870
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 19:28:05 2019 +0800
修改版本号和免责声明字体颜色
commit e627b67e63d6fa3c1d4faa9ab492c0bf4d8ee1c1
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 19:22:48 2019 +0800
开单项没选择时，不跳到医嘱
commit c60e17b33180d7485a46ca9e98c0ed16c7775f2a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 18:32:50 2019 +0800
注释同类药物双击打开药品说明
commit bfad6c404134c5268b07a2c79f1f8a386f952bc8
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 18:20:17 2019 +0800
诊断延迟搜索
commit 69b02c93e3b2afb26f44733c2ef9558e2852047e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 17:04:52 2019 +0800
查体既往史类事件处理添加
commit bdc074220b4d662818d430e56e7f9796efd06537
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:58:12 2019 +0800
其他史乙肝有高血压顺序勾选bug修改
commit 48abc323e58cf8f400c0371b5cdff14fdf54b4d9
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 16:57:11 2019 +0800
nothing to do
commit f6f6e023919d536dd60b746e6f3b0b3267c332c2
Merge: 3b8fdf4 6af13c9
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 16:51:35 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 3b8fdf425f7cd93dbb736cfe8bcb90ac72b900bf
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 16:48:56 2019 +0800
通过ID搜索药品说明书（添加数据时查看药品说明书用）
commit 6af13c94c3cb901fbc0e49f77ecb45f1950b4fbc
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:26:45 2019 +0800
翠加
commit e1af9c88f74e6483b81850953f1af2051040e677
Merge: 5ae9b8f 012bb7f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:21:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 5ae9b8fae1e7d1f56f160b6f2d621b8d6e53658d
Merge: 8decc9d 5b1feca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:21:38 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/common/components/SearchOption/index.jsx
# src/common/js/func.js
# src/components/CheckBody/index.jsx
# src/containers/CurrentIll.js
# src/store/async-actions/homePage.js
commit 8decc9d3e8255de2c81420a833e69582686aafdd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 16:19:15 2019 +0800
罗磊修改
commit 012bb7f0ea4d0ec66f313834b0e97beed46c028f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 16:17:54 2019 +0800
药品说明图标增加鼠标进入状态
commit c4ea61552060862a541493087ec096a413cbca2c
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 16:12:30 2019 +0800
高度计算有误
commit 50769d9e8a9845954a58145e5b7041b131729b67
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 15:59:38 2019 +0800
标点预览
commit 4a8b8a17d9b784225eaa07d67925752339418ee1
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 15:49:58 2019 +0800
滚动条问题
commit a4f1c2776effa4bfb1c9628d48cee2a755d8558b
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 15:36:47 2019 +0800
诊断搜索增加搜索值为空情况
commit cd77c307ae34abe8cfb6fb53f235beb8f43d884d
Merge: ac44ed4 f7ec699
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 15:28:05 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit cee1138681863aa93e2374d48707171b294c0032
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 15:24:41 2019 +0800
预览行内样式部分修改到less中
commit ac44ed44fed7b42457e2dfc60b9ab13c97e0ced5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 15:06:10 2019 +0800
提示信息疾病详情页右侧菜单
commit 816fa09299c0177beac8573e50be4c86495a37f2
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 14:59:20 2019 +0800
标点灰显bug修改，下拉对应标签高亮颜色修改
commit 3330385dd3ea7b2b419f5dbb92f05f8a20bc3c39
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 14:09:59 2019 +0800
标点符号跟前一个标签灰显黑显
commit b77a4e183b8413cbac1b663233b3382c7641857d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 13:43:26 2019 +0800
修改诊断搜索参数
commit b1f56da5d60d2944c4bbc8a8ccc61548f08b55e1
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 13:26:29 2019 +0800
纯标点符号不搜索，查体获取数据bug修改
commit d6849d30404fe7d3346909a7e10bc894d1f2ba33
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 11:39:43 2019 +0800
只有标点符号时不搜索
commit 4f7c951a117bec49fa853071847422a8dbf51e9a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 11:23:42 2019 +0800
单选组件双击编辑删完后失焦显示重复值bug修改
commit d771a09a5fc4e3e7af92e3ff3c85ed44975b2648
Merge: 28cd3ba f7ec699
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 11:13:20 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 28cd3bac18b0daa796f8a1a9292db3a24cb8e862
Author: Luolei <16657115156@163.com>
Date: Wed Feb 20 10:41:36 2019 +0800
主诉数组多个空格元素处理
commit 790d34dc38e886c3df1e67603922838f904e4ea7
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 09:48:25 2019 +0800
药品说明书鼠标指向方式
commit f7ec699eb2b493c4bbbd0ee60194b639a6c8b8e8
Merge: 6c245fb 909ab25
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 09:43:41 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 6c245fb0901d2234a0aef7568039651dd4cdf91e
Merge: 96cc574 e36be2b
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 09:43:15 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/common/components/SearchOption/index.jsx
# src/common/js/func.js
# src/common/less/variables.less
# src/components/Operation/index.jsx
# src/components/PreviewBody/index.jsx
# src/components/PushContainer/index.jsx
# src/components/SpreadDrop/index.jsx
# src/containers/CurrentIll.js
# src/store/async-actions/patInfo.js
# src/store/reducers/assistCheck.js
commit 197b0e5b453fa4446f71b728768baa67e5ab4700
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Feb 20 09:42:48 2019 +0800
修改版本信息字体大小
commit 96cc574ab24f3da14e1f89610e6c5a1e451fa051
Merge: 5a2d97b fe9e87d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Feb 20 09:35:47 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/common/less/variables.less
# src/components/PushContainer/index.jsx
# src/utils/tools.js
commit fe9e87d5e0735c356cc4041292dad4ce9cce18dc
Author: Luolei <16657115156@163.com>
Date: Tue Feb 19 17:30:38 2019 +0800
搜索为空清除列表数据
commit 909ab253717bafa4c9ffb3164441d8554e17ed03
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 17:27:10 2019 +0800
输入框添加行高
commit c870ce40e66ec3471bd8ab660346d41ca6374891
Merge: 82c0130 cb47bc5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 17:12:48 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 82c013012b1ec9adad9ea974c609c785bae349b2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 17:12:26 2019 +0800
删除console
commit 656a2e69d55a87696a52780074cdb97ebf72c3e5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 17:03:22 2019 +0800
提示信息详情页弹窗显示
commit 94a46327141d7b22d245afbfef4908fca8b852df
Author: Luolei <16657115156@163.com>
Date: Tue Feb 19 15:50:52 2019 +0800
化验没有参考值正常显示
commit 5a2d97b0f644ef6172cce575e520ca3000cef9b0
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 19 15:28:39 2019 +0800
ie8点开下拉未选值存值bug修改
commit 23f6f91a57f4c57826e5cd4adc6aea676a21751e
Author: Luolei <16657115156@163.com>
Date: Tue Feb 19 15:19:16 2019 +0800
1.ie8自动转换中文为unicode导致判断有误
2.阴影改为边框
3.主诉现病史删除得到数组里有空元素处理
commit 5e1184e69747c823a1ce3bba657332f1443f802b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 19 15:15:35 2019 +0800
回读无查体点击唤出模板
commit 48a9a00b3b5b31e499d32f8f6edbbda57390e721
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 19 14:30:22 2019 +0800
切换模式其他史数据bug
commit 4717362f96dd641518ca546c2b270a2c3f6d5002
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 19 11:38:42 2019 +0800
血压类文本子标签存值
commit 08f9160a8e26952c695d9563ece0cef09d7e6164
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Feb 19 10:59:43 2019 +0800
清除移除患者信息缓存
commit cb47bc5b79d7f6e319a1b837d27012841925c678
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 17:16:42 2019 +0800
翠翠分支未合单独添加
commit 2a770d6266f8c7f5f0bd892befa6fa69166487bd
Merge: 3e68866 86e1d1d
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 17:14:17 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 3e688668bdaf2d376901cfa70a90a3587ad7ff69
Merge: dc08557 4f90da8
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 17:14:11 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit dc0855703def7c3a0c56c74d0b033b42657cb62e
Merge: 13db5c1 db268fc
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 17:14:02 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 4f90da88492079a14a3c167d364cc6b0160c668c
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 16:58:38 2019 +0800
弹窗关闭时机
commit 13db5c1cccec8c7f3ac5cb72d19aaf05a5bb63e4
Merge: 58cffc8 6e906e0
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 16:56:59 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 6e906e06753a119829e67db34a0e32e1c2d1a4db
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 16:23:12 2019 +0800
查体选中杂音血压选中状态bug修改
commit 1e57bc5dc0b63eaaa040d59d53c9f1a9409d2030
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 15:42:03 2019 +0800
单选组件下拉项可和名称相同
commit 9318dc730440ce833cd1317aed52699572208224
Merge: 58cffc8 db268fc
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 14:21:22 2019 +0800
Merge branch 'dev/byll' into dev/new1
commit db268fc6f4c11065e36e4405170bd08e667ce6fa
Author: Luolei <16657115156@163.com>
Date: Mon Feb 18 14:19:41 2019 +0800
ie8搜索单个文字删除报错问题
commit 86e1d1df0baee680a7c5bf99e8d6cbae4284c83c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 14:15:14 2019 +0800
治疗方案药品说明显示方式
commit 1391edf5cda27a44817030cb9fef6486da15b51e
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 14:14:41 2019 +0800
下拉框打开时标签边框蓝色
commit 758555c01c184adde48fb869909a1b9fdb77f4b1
Author: zhouna <zhouna@zjlantone.com>
Date: Mon Feb 18 13:50:39 2019 +0800
箭头函数传值性能问题修改
commit 8e25532ad88b1ca014acaaffb61155f3f62e8c64
Merge: 7a78823 58cffc8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Mon Feb 18 09:48:15 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 58cffc89d51661f2edbd21e1424fdd29afd590f9
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 18:21:01 2019 +0800
上次提交回退
commit 4ca59db29b1a256c9b3015646301c0105cead455
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 18:13:57 2019 +0800
数字组件ie8输入报错参数无效bug修改
commit 5afd59399265b3a516e35317687946d2df551c9b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:59:35 2019 +0800
删除多余代码
commit d56b647e2f32fc9e5a50e58376d1677076b9c5c0
Merge: deb3340 e5ee60b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:57:54 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/containers/CurrentIll.js
# src/store/actions/mainSuit.js
commit 6c4e29739d3dbe45b1843f5a5fb2c054784d0739
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 16:55:03 2019 +0800
ie8右浮动不生效
commit deb33405ce270e3b1495e51fd537fa6d56f1a615
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:54:34 2019 +0800
免责声明弹窗层级bug修改
commit 15718f043d724dd440aab0d23c6eaf3cf54d2059
Merge: c2f5a1e 0ca5c1f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:34:51 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit c2f5a1e29bd29942c2faa59fd4fd645bbe50a814
Merge: a1c28c3 19f31f4
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:17:11 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/components/AddAssistCheck/Textarea/index.jsx
commit 0ca5c1f1aa7ce0b7c558cd53b0c4fc19ad096f90
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 16:13:59 2019 +0800
11
commit a1c28c3d77f4d5d27b7ec1ef0ceb1aaf8a6afdb4
Merge: 8bc39fc 3dbeabd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:13:41 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 3dbeabd15713010eb953dcee9c619e0cb4e89baa
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 16:10:56 2019 +0800
弹窗层级修改
commit b34feffbe308202a21d56c822371d5900e4d784c
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 15:53:02 2019 +0800
其他史无主诉第一次提示后不再提示bug修改
commit 541a45685981ece9caf11ef7ee13d871e1aaaf27
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 15:47:44 2019 +0800
搜索框下拉位置bug修改，杂音文字为多行时下拉遮挡文字bug修改
commit b9bb9cba1fe356d94bdc64a1caa4b60460bdef68
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 15:36:55 2019 +0800
复制内容样式乱掉问题解决
commit 9641e6a1c9fd1fefa66a4324401cf38d60e29cf3
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 14:37:35 2019 +0800
无殊选中状态遗留bug修改
commit 641c5762b7f7f98d532eb23fc97f881d33575222
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 14:18:44 2019 +0800
打印相关样式修改ie待测
commit e93c7c1557bee766ff94dfa4952cdf2f69c4e926
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 13:51:30 2019 +0800
用户信息banner不被下拉框遮挡，杂音选中样式修改
commit 64d1cffdb7e562263084ba5827df988a099ec7b7
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 13:26:25 2019 +0800
杂音类型下拉样式优化
commit 08ab0d25e5c54f3535156e248de5063ff4454a2f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 11:31:31 2019 +0800
其他史查体tagType4类型搜索选中展开
commit a96e98a90f83c7d0e625f973b79cb65d33792623
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 15 10:48:50 2019 +0800
获取模板接口放在获取病人信息回调中，确保参数不为空
commit 19f31f4d19c841c9a0a86be849d749815e27a1c1
Author: Luolei <16657115156@163.com>
Date: Fri Feb 15 09:43:48 2019 +0800
修改标题点击enter问题
commit 8bc39fc836e6f24fc599d8d679164f7412ac71f3
Merge: 993eaf0 6fe34e5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 17:56:44 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/AddAssistCheck/index.jsx
# src/components/Inspect/index.less
# src/components/NumberDrop/index.jsx
# src/components/Operation/index.jsx
# src/store/actions/checkBody.js
# src/store/actions/mainSuit.js
# src/store/reducers/assistCheck.js
commit 993eaf02f2d5d2b0244587ed7096d1fcf9659465
Merge: 11260ee 6ca010f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 17:52:56 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 6ca010f83a2b882163bfaf3ee7f125f45e8d5ce3
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 17:36:47 2019 +0800
字体不一样，button问题
commit 8433d68d9027b2c31c5db2da33182c1507f08f9b
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 17:12:29 2019 +0800
更改中文冒号，修改辅检div样式，添加搜索ie8兼
commit 11260eeb9c9958368e933981df83e4e097a04c9d
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 17:08:07 2019 +0800
杂音类型双击编辑blur后重复输入值bug修改
commit 2911db7154036da7df72eb04b6e2a35b32c71106
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 16:48:08 2019 +0800
双击编辑前后缀bug修改
commit 6eef6a051d230f9f52a1df2ae6b5e3044c7b3505
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 16:33:58 2019 +0800
主诉-其他史组件双击编辑前后缀存值
commit 00f2e00fb09170526cd4101b320ece3b694e28f3
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 16:07:49 2019 +0800
查体数字组件双击编辑前后缀存值，血压类型标签双击编辑时不显示下拉框
commit 8019239ea85bf8e66de7adff69d1fcc9b94eb226
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Feb 14 13:57:24 2019 +0800
修改ie8多[]bug
commit 70689ffbb3b43af0bcd21e0c6898855ede313faa
Merge: aca9d8f 3fe1212
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 11:36:41 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit aca9d8f6b118a3653050c6f59cbed645ac1b824d
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 11:19:43 2019 +0800
判断模板保存前后是否相同
commit a643a04284503f3491206a6da28f02e3b239bdfd
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 11:03:33 2019 +0800
打印保存判断问题
commit 665613f2a02a496e485917ee653ba58e4744fa7d
Author: Luolei <16657115156@163.com>
Date: Thu Feb 14 09:38:25 2019 +0800
写死参数更改
commit 3fe1212b9a37b328037ea87e8ed83b83bc71a5a6
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 17:56:33 2019 +0800
其他史提示无主诉时可输入bug修改
commit d895d0391f5389858501b5be2d98c93516740f1a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 17:29:35 2019 +0800
查体框可编辑状态删除
commit 0ea49aca9cfc5399c0d074c81fe7a330a76ed40b
Merge: 2799250 2facfcb
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 17:19:21 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/containers/eleType.js
# src/store/async-actions/treat.js
commit 2facfcb8073c095fa0b6ae3eb54566fb072d7c85
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 17:15:41 2019 +0800
查体获取数据失败时可输入bug修改
commit 141ab5430c47c52bcff13dc7d34cc5a7fa134d4c
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 15:12:53 2019 +0800
其他史查体搜索结果放前后bug修改
commit 9572b216a7c48e9947d3ce028b10f5849cb72102
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 14:34:34 2019 +0800
其他史搜索选中位置bug修改
commit ee5b7c3eb6a0e6328e2ee500deca54b756d69848
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Feb 12 13:48:27 2019 +0800
搜索bug修改
commit c7e0483300e2188b162ce41063d38a50706979aa
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 16:34:50 2019 +0800
11
commit 7a7882300853f5a273686f709ab0462ad706a8f0
Merge: 420bcf7 2799250
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 15:28:00 2019 +0800
Merge branch 'dev/new1' into dev/zhangxc1
commit 27992500bd6cd1d92f6cc4411a8436f36ef565d0
Merge: 9573ac3 945c448
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 14:57:17 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit 9573ac3a696fa8e206e5a46e588dc4daad049381
Merge: c90d43b fbbb8fb
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 14:57:10 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit c90d43b677ba6dbaad86bd1fc8d4731eb46165b5
Merge: d2c86ef 81e413f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 14:56:09 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/containers/OtherHistory.js
commit 81e413f1f4296fc8bcc22485e5779ddb776478f1
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 14:53:45 2019 +0800
之前修改的bug找回
commit 420bcf750b1e316f23b750de4985441221ef0a5c
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 14:53:11 2019 +0800
修改同类药物样式
commit 3bf089d9605e75bf7511e9d42fa6b03c9c6066b1
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 14:44:35 2019 +0800
改为全局弹窗显示
commit fbbb8fbbb040b404ee7307b1b95505cea783626a
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 14:38:23 2019 +0800
修改添加诊断推送
commit e1240a8e9f409aa5e4382e2bc0ef63ed6ff0a1dd
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 14:20:22 2019 +0800
弹窗高度动态设置
commit d2c86efb89cba523db9c587e7d8435a4b2be8531
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 11:16:53 2019 +0800
无选中项体温输入bug修改
commit aa6d15a7c141f10f275f1fc470d0eba476ffc4b2
Merge: 9f91346 1fccd43
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:57:06 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 9f91346e73a2a64ce463baf32723a8c9e3b9cc05
Author: Luolei <16657115156@163.com>
Date: Fri Feb 1 10:55:41 2019 +0800
bug修改
commit 1fccd439ee53729685732eeb6fbbfe1be0eda80d
Merge: 986a3cf 2e25c1b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 09:58:11 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
commit 3385c2c2a41d0b223136f5f176487cce09e1c082
Merge: b876b6b 2e25c1b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Feb 1 09:51:36 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/otherHis
# Conflicts:
# src/store/async-actions/treat.js
commit e697f350f7724505282d06dfa0dc2ae001ea9c09
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 09:46:57 2019 +0800
删除console
commit 2e25c1bb7076358b6e4063ced5731c3f456eb704
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Feb 1 09:40:43 2019 +0800
诊断第一个为复诊添加到主诉
commit 986a3cf5976bfec9bce6afb554bab1f4a1a2a49d
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 17:33:59 2019 +0800
合并
commit c900ae632d99d0c0fb2e2e5f9788707ada02745a
Merge: 31ef38b b7bfe2b
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 17:18:38 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/CopyRight/index.less
# src/components/DiagnosticList/index.jsx
# src/components/Inspect/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/components/Operation/index.jsx
# src/components/PushContainer/index.jsx
# src/components/Treat/index.jsx
# src/components/Treat/index.less
# src/containers/NumberUnitDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/diagnosticList.js
# src/store/async-actions/treat.js
# src/utils/tools.js
commit 31ef38b3d5b46612b64866687214c2b9d1651b03
Merge: 44fbf2b d6751d9
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 17:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddInspect/index.jsx
# src/components/CopyRight/index.less
# src/components/DiagnosticList/index.jsx
# src/components/Inspect/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/components/Operation/index.jsx
# src/components/PushContainer/index.jsx
# src/components/PushItems/index.less
# src/components/SpreadDrop/index.jsx
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/utils/tools.js
commit 44fbf2b8d8f90640a9af8abe4da55c2af7efa319
Merge: db4e755 935c0cf
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 15:52:43 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
# Conflicts:
# src/components/PreviewBody/index.jsx
commit db4e7559fb2bc15434058503ca8d1a1e3ffe8ad6
Merge: edb84b0 9483642
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 15:44:26 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/components/TreatDesc/DrugInfo/index.less
# src/store/async-actions/treat.js
# src/store/reducers/treat.js
commit edb84b07adad34cdd5c94a592e543127d20eaec1
Merge: b876b6b 6b71cd5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 15:35:50 2019 +0800
更新
commit b876b6b8dc6afe12ae2a90c990d147e32221d02c
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 14:38:05 2019 +0800
其他史有伴无排序
commit f8ab9c103e8266a6ab44466a7fadbc1f0a91ceca
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 14:06:33 2019 +0800
查体搜索自由文本位置bug修改
commit e45296e22263659c86f60d031bc5246c7f1be726
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 13:51:40 2019 +0800
复诊主诉文本模式bug
commit f5cae58692247cad7c0b3ff8966a2f7d5213069c
Merge: 960317d d3e160a
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 13:39:27 2019 +0800
Merge branch 'dev/new1' into dev/otherHis
# Conflicts:
# src/components/SpreadDrop/index.jsx
commit 960317de925978075041b722cd3500488ce924fd
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 13:36:13 2019 +0800
双击隐藏下拉
commit 06571b04a337a3805d723e22e964c5ba683293f5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 31 10:28:18 2019 +0800
主诉saveText无值则判断为空，查体其他史聚焦提示
commit 94836425d1dc9b9cf5cc1f2ce6f3bdc3706fd578
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 19:50:58 2019 +0800
修改版本信息样式
commit e0092d7003c2bcfecc38a77350d29ddc1a92dbf2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 19:40:32 2019 +0800
关闭药品说明书时清除内容
commit a921420ddd0b8c4c8101b1d5bb1d7fec8e422341
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 19:01:15 2019 +0800
修改治疗方案和药品说明书样式
commit 935c0cf687389a50aeef502b97f07685e675bd1d
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 17:16:52 2019 +0800
滚动兼容
commit 6b71cd51bbafd8c4283b1c16fae3a538a88f5651
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:54:56 2019 +0800
现病史病程变化
commit 91c3713c62e8eb4b9437b00d754133e87561d8cc
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:36:48 2019 +0800
注释scrollTo
commit 2123a1e9839af1052e1405d6a005ddf521041c9d
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:10:44 2019 +0800
Squashed commit of the following:
commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 16:00:51 2019 +0800
打印医生签名自动获取
commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 14:09:41 2019 +0800
样式调整
commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 14:02:27 2019 +0800
化验填写单清空按钮，弹窗还在
commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 13:46:36 2019 +0800
模板列表获取时机
commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 13:34:03 2019 +0800
模板名称重复弹窗不关闭
commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 10:46:13 2019 +0800
模板保存跟之前所有保存的模板作对比
commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:35:01 2019 +0800
底部几个按钮换行设置最小宽度
commit 7400613a1eb642e1d01004c7818883fd73c2350c
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:28:45 2019 +0800
历史病例时间和按钮不能共存
commit eda3f4b08a3460360541cd2af1c2ca071681c595
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:12:47 2019 +0800
bug修改
commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 15:54:49 2019 +0800
还是符号处理...
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
# Conflicts:
# src/utils/tools.js
commit 6df92ea9ddd29c14979874f2f0e7eac54d032eaf
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:07:27 2019 +0800
Squashed commit of the following:
commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 15:20:06 2019 +0800
治疗方案样式
commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 15:18:20 2019 +0800
修改治疗方案样式
commit 859a7364a96569f6aa92360efbce5a19b40681cb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:32:44 2019 +0800
修改治疗方案小标题样式
commit 99789b23f06c18e5b588552066faf7f2ccacf198
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:07:48 2019 +0800
修改治疗方案同类药物
commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:00:40 2019 +0800
修改弹窗IE8不居中
commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 20:30:39 2019 +0800
治疗方案高度自适应
commit c000d83fb6ac5f265951c0e1377b627d24d2da10
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 17:27:30 2019 +0800
修改治疗方案边框
commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:58:28 2019 +0800
导入化验结果，第一次添加诊断为主诉时不往主诉添加字符串
commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:56:03 2019 +0800
治疗方案标题添加疾病名称
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
# Conflicts:
# src/components/Treat/index.jsx
# src/components/Treat/index.less
# src/store/async-actions/diagnosticList.js
# src/store/async-actions/treat.js
commit 20f96c311119b635dad33f6c9222d94d8563bbfe
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 16:02:31 2019 +0800
Squashed commit of the following:
commit 27178b569e9575d450bbf1ce329e069d4c4b4b8c
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 30 15:57:20 2019 +0800
ie8现病史添加症状报错的问题&查体血压选中不变黑的问题
commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 18:17:15 2019 +0800
查体模板添加逗号，主诉两个时间处理
Squashed commit of the following:
commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:51:09 2019 +0800
Squashed commit of the following:
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit fea9a721ccb5afb9f1873c2111e3722d7330d394
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:50:07 2019 +0800
Squashed commit of the following:
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
# Conflicts:
# src/components/PushItems/index.jsx
commit 2c70e41e7a5254838436b499b1ad787f523585f8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:42:54 2019 +0800
Squashed commit of the following:
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/NumberDrop/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/store/actions/mainSuit.js
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/PushItems/index.jsx
# src/utils/tools.js
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
# Conflicts:
# src/containers/NumberUnitDrop.js
# src/store/actions/checkBody.js
commit 6c38756e3ca1c80cc8e517d91d04a2dcde7a3ff7
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 16:00:51 2019 +0800
打印医生签名自动获取
commit f96df5b81cb4f1a89188a0b2d9bbf188183c064d
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 15:20:06 2019 +0800
治疗方案样式
commit 692d36bf0ba1c8aa1eaa10f995b0e09875f83dc0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 15:18:20 2019 +0800
修改治疗方案样式
commit 859a7364a96569f6aa92360efbce5a19b40681cb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:32:44 2019 +0800
修改治疗方案小标题样式
commit 98273ce5f5c7895fb32b0b1fd9c55c196aa27e2d
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 14:09:41 2019 +0800
样式调整
commit 99789b23f06c18e5b588552066faf7f2ccacf198
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:07:48 2019 +0800
修改治疗方案同类药物
commit 1e5d96c6aed399cb07d43e400eb4ed57b2c19f4c
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 14:02:27 2019 +0800
化验填写单清空按钮，弹窗还在
commit aae1d5e66e5e1918046aa52bf800dc66c3cf44df
Author: zhangxc <zhangxc@zjlantone.com>
Date: Wed Jan 30 14:00:40 2019 +0800
修改弹窗IE8不居中
commit a03cece3ea73d9dfd3eca1a44cf5fa248859cb48
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 13:46:36 2019 +0800
模板列表获取时机
commit 892cb82886b87e2e868f7f5ab8c896a3b4a031ff
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 13:34:03 2019 +0800
模板名称重复弹窗不关闭
commit 87c6d028a2657d667686ed1f8235ef86bf2ff400
Author: Luolei <16657115156@163.com>
Date: Wed Jan 30 10:46:13 2019 +0800
模板保存跟之前所有保存的模板作对比
commit 0d947f0d5e8965ce807bb6ee5a7e9cbd4b79d2fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 20:30:39 2019 +0800
治疗方案高度自适应
commit 3e1c705ef6c2b2d0944ced37b8fa3f7c01307e25
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 18:20:27 2019 +0800
Squashed commit of the following:
commit 3b882867e43255ddd7c2604cfa1f560fb1b4770a
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 18:17:15 2019 +0800
查体模板添加逗号，主诉两个时间处理
Squashed commit of the following:
commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:51:09 2019 +0800
Squashed commit of the following:
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit fea9a721ccb5afb9f1873c2111e3722d7330d394
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:50:07 2019 +0800
Squashed commit of the following:
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
# Conflicts:
# src/components/PushItems/index.jsx
commit 2c70e41e7a5254838436b499b1ad787f523585f8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:42:54 2019 +0800
Squashed commit of the following:
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/NumberDrop/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/store/actions/mainSuit.js
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/PushItems/index.jsx
# src/utils/tools.js
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit 29c1368835bc2bd4c4dcd368419b916e86512b9e
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:35:01 2019 +0800
底部几个按钮换行设置最小宽度
commit 7400613a1eb642e1d01004c7818883fd73c2350c
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:28:45 2019 +0800
历史病例时间和按钮不能共存
commit c000d83fb6ac5f265951c0e1377b627d24d2da10
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 17:27:30 2019 +0800
修改治疗方案边框
commit eda3f4b08a3460360541cd2af1c2ca071681c595
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 17:12:47 2019 +0800
bug修改
commit d13d3006f770c75fef4a4d16ac1e7b32691d5afc
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 15:54:49 2019 +0800
还是符号处理...
commit 135ef48b82fc3fccb54c65871b5ee983162c81a5
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:58:28 2019 +0800
导入化验结果，第一次添加诊断为主诉时不往主诉添加字符串
commit 24c6ec0c46d66ddb61e864c1f56474f04abaf402
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:56:03 2019 +0800
治疗方案标题添加疾病名称
commit aa84581e6ee77d5a1c88e53d892a2faa685ad63e
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:51:09 2019 +0800
Squashed commit of the following:
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit fea9a721ccb5afb9f1873c2111e3722d7330d394
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:50:07 2019 +0800
Squashed commit of the following:
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
# Conflicts:
# src/components/PushItems/index.jsx
commit 2c70e41e7a5254838436b499b1ad787f523585f8
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:42:54 2019 +0800
Squashed commit of the following:
commit 519f23c91954f87e836cbd400b158f774c498ba6
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 15:35:59 2019 +0800
文本删除又出现的问题
Squashed commit of the following:
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
# Conflicts:
# src/components/AddInspect/index.jsx
# src/components/Inspect/index.jsx
# src/components/PushItems/index.less
# src/store/actions/checkBody.js
# src/store/actions/currentIll.js
# src/store/actions/mainSuit.js
# src/store/actions/otherHistory.js
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/NumberDrop/index.jsx
# src/components/NumberUnitDrop/index.jsx
# src/store/actions/mainSuit.js
commit b7f19c39c781941189b98ebb52c2cbe6bff6dad0
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 15:22:37 2019 +0800
修改第一次添加诊断为复诊，化验和辅检不为空时不往主诉加字符串
commit 799eef5c34a21f9d90bc82a40240838cf10ba601
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:41:20 2019 +0800
ie8治疗方案遮罩
commit 50e03ffa0a5ceaac50f9585ebefae27a05e838c7
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 14:17:40 2019 +0800
顿号去重
commit fee35d5473b69aafb5335759006a93fea8d14145
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:05:16 2019 +0800
治疗方案遮罩IE8
commit eee1ac639dc3d91aa4145aa145234e01c8d4cbf6
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 14:04:58 2019 +0800
修改右侧推送字体大小
commit d01d40bd967f15acc0872e83174ee8ad3e684b6f
Merge: 4095b3f b09559b
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:59:54 2019 +0800
Merge branch 'dev/new1' into dev/byll
commit 4095b3ffaf8aa6c98e912bcbc5eef7f66ecb25b4
Author: Luolei <16657115156@163.com>
Date: Tue Jan 29 13:55:47 2019 +0800
样式宽度更改和逗号处理
commit a157eec90e73d0ca3554bc5ab04f60e3ef4a660e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 29 13:26:56 2019 +0800
修改化验项开单逗号问题
commit b09559b62ebd470329cb1d5f8a9fe82889a4f32b
Author: liucf <liucf@zjlantone.com>
Date: Tue Jan 29 11:44:56 2019 +0800
NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText
commit eec53100dcee36be4a80af88e65a5b9772f71f4d
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:41:03 2019 +0800
Squashed commit of the following:
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 57f04c373a88a9dade9ab96e69e8dcda990e3a8c
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:38:40 2019 +0800
Squashed commit of the following:
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit e36f2f1b811d6978117161f50b16dd5bae298547
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 10:33:30 2019 +0800
Squashed commit of the following:
commit 6a1725db7f487c5f09ccc471c7d41180fa0550d6
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 15:59:14 2019 +0800
单选、多选、时间单位组件双击编辑删除完内容时删除该标签
commit 66da8462149fc19ad48a2cf28f137a1ec1717fb4
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 14:21:41 2019 +0800
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 7e6b5fac0ffe1696d8eb49b8da5412a6624af0c2
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 13:13:11 2019 +0800
单选和多选编辑失焦时调用推送接口
commit d6751d916bd9aff60373a28ce2240bc078809e9a
Author: liucf <liucf@zjlantone.com>
Date: Mon Jan 28 09:51:31 2019 +0800
合并new1分支
Squashed commit of the following:
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit caad36f002904aa859a0d780eefdf5b9cdc9011e
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 11:24:02 2019 +0800
时间单位组件IE兼容
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit 58e0fdd1ab99664163923ff7ae455efff5850195
Author: liucf <liucf@zjlantone.com>
Date: Fri Jan 25 09:20:30 2019 +0800
主诉IE兼容性处理
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 79e0195a9b13069db729afe732bc5b466d43a37f
Author: Luolei <16657115156@163.com>
Date: Fri Jan 25 14:06:09 2019 +0800
date修改
commit 29b2499b796085a682a936d82c97decc35edf891
Author: zhangxc <zhangxc@zjlantone.com>
Date: Fri Jan 25 13:50:07 2019 +0800
修改版本信息和免责声明位置
commit d3e160a516240b77576567b993223816a68231a6
Merge: 79e63ed c7e9e73
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:48 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit c7e9e73e9d9aaeb7d9679529357de51d8b92ee2b
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:46:16 2019 +0800
化验辅捡ie8搜索卡死修改
commit 79e63ede6ec9b2c622ab6224b2c97164edd09a68
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 13:12:43 2019 +0800
默认host地址删除
commit e01035349f92405572238a0a97d80bb557dda802
Merge: 8a8015d caad36f
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 11:45:20 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit c7fb4308b7d9902d165f4fac33dfa9eb0316e2b8
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 10:59:52 2019 +0800
修改样式
commit 8a8015df63bf6660e26e4b01ad09388f3e7ce771
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:46:01 2019 +0800
合并报错修改
commit ae92c46aa3c4c8eef5371da46c6c3094077c6035
Merge: bbe85ff 58e0fdd
Author: zhouna <zhouna@zjlantone.com>
Date: Fri Jan 25 09:42:51 2019 +0800
Merge remote-tracking branch 'origin/IE_test' into dev/new1
commit bbe85ffa8e67f29aeba17478a4716392dcd1e115
Merge: b86268a 3bfa819
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:30:05 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/containers/SpreadDrop.js
commit b86268a57afae26c7972b4b2362ae656a6784a8d
Merge: 79c59d3 105488f
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:25:44 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc1' into dev/new1
# Conflicts:
# src/store/async-actions/treat.js
commit 79c59d3aa9c95771acb4e47b5f0cbf411d343676
Merge: db90e04 de190a5
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 20:24:40 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit de190a5b1d4bb939f82c40fffe7822981ff25fc8
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 20:18:42 2019 +0800
中英文逗号
commit 7052feac317ed8e7bc26253c1e6a0c905f92e875
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 18:31:55 2019 +0800
去掉英文逗号
commit 105488feef9e89309ecc23f2c9bce944da3490fb
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 17:22:34 2019 +0800
修改治疗方案
commit db90e04f23baf95466e34498ca06101f49a7ac7e
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 16:49:10 2019 +0800
下拉项间距调整，ie8事件兼容
commit 596d9a1d2d5c4fff4f810b3241eac849a8e4b6a4
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:09:49 2019 +0800
药品说明书样式
commit edc05e9abc87cdc15e10bb54c36dafe92f2485b8
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:08:17 2019 +0800
修改药品说明书
commit 32f8ef8e15a7ef7408f9cb8077d5b691a9b65423
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:06:17 2019 +0800
修改开单样式
commit 19ebe4be097e45a3425ee4c70caecbd3425b0490
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 14:02:30 2019 +0800
修改获取患者信息路径
commit 6f95c909024a0c09f7ae316f9809ff96373365e2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:43:38 2019 +0800
添加诊断判断有没有治疗方案
commit f617e5c267246786e7a6801cc87811f0d2527235
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 13:39:13 2019 +0800
merge from 'dev/zxc'
commit 87e941c29ed951540497c18c0a493c55b222ce00
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 10:33:44 2019 +0800
提示语
commit 486a1fbf8bdd6ccea7bd38a1f0d3accdf5c8e0dc
Merge: d3ade00 95e9a94
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:09:57 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/components/DiagnosticList/index.jsx
# src/components/Operation/index.jsx
# src/containers/SpreadDrop.js
# src/store/actions/otherHistory.js
# src/store/async-actions/treat.js
# src/store/types/checkBody.js
commit d3ade00ac4b7f2c5d20feb322874546ef6f9e8ca
Merge: 2fd497e 2458ea1
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:05:17 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
commit 2458ea1788cf9ae1acacb2f0ad090d2f2525eb53
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 10:03:28 2019 +0800
提示语消失默认时间改为2秒
commit 95e9a941766b9d5454f3c92fc614aa3321bce664
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 10:02:00 2019 +0800
治疗方案置灰
commit b4e71c9cda0d4e72ade01f6a0c1f23513073961f
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:59:16 2019 +0800
治疗方案
commit 65a61b65d4b14aae1c4ff32984cc70dd048cce08
Merge: 62bd7fb 38f9720
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:47:47 2019 +0800
Merge branch 'dev/new' into dev/zhangxc
commit 62bd7fb4b452b98cf9a05bc75e496cb43d24e9fd
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:46:32 2019 +0800
Revert "Revert "修改药品说明样式""
This reverts commit 1cba16137b012f54873b193ab6b16968022d0c96.
commit 2fd497e9e1b8438d5d74550655a6a985b1776f9c
Merge: 28c364a c37d1cc
Author: zhouna <zhouna@zjlantone.com>
Date: Thu Jan 24 09:46:00 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit 1cba16137b012f54873b193ab6b16968022d0c96
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Jan 24 09:45:29 2019 +0800
Revert "修改药品说明样式"
This reverts commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e.
commit c37d1cccee29b0f347cb58c20b15da014cf5f5d7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:25:58 2019 +0800
搜索列表显示样式更改
commit c17c91979a3ec1e680959fde9f9cd7da9580f8f7
Author: Luolei <16657115156@163.com>
Date: Thu Jan 24 09:15:40 2019 +0800
样式调整
commit 28c364a47a4a1e59137e0942248f006ce1e10c0d
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:22:29 2019 +0800
修改导入host
commit f75c649c857013b890959fa7e1d3992912ddd1ca
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:15:44 2019 +0800
临时修改版本弹窗高度
commit e0376902fb956ee58c40b86ae97b924ce5955e75
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 21:10:27 2019 +0800
化验导入删除填值推送
commit 38d5d80ae62a8c393f4623f1774b756f078d6954
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:43:48 2019 +0800
添加删除辅捡右侧推送
commit d54073a78ccc7697f333c3d8ecc98922f14dc669
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 20:30:50 2019 +0800
修改杂音选中项bug
commit a7804f15d955022f912efa89cd3f0722bd5f02a3
Merge: b489e52 6a1a3df
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:58:07 2019 +0800
Merge remote-tracking branch 'origin/dev/byll' into dev/new1
commit b489e5280cb7a214cf124116aea673ca2d4cefc3
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:57:50 2019 +0800
既往史无殊选中bug
commit 6a1a3df4079f503a993b64d6d7a32add9c12aadc
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 18:57:03 2019 +0800
css
commit 96efc7b8118a99db629f898960621b98786bd42e
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 18:26:40 2019 +0800
合罗磊分支
commit 0d177307ce04b30a1b87370389d46a5b9a0fa4d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:49:02 2019 +0800
回退
commit ef1f67f9a0e3186cf6cc718cf89b8f6fe7f61bea
Merge: 6732dbb 1dd6c92
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:44:02 2019 +0800
Merge remote-tracking branch 'origin/dev/luolei' into dev/new1
# Conflicts:
# src/common/components/TailInlineTag/index.less
# src/common/components/Textarea/index.jsx
# src/components/AddAssistCheck/index.jsx
# src/containers/OtherHistory.js
# src/store/actions/otherHistory.js
commit 6732dbb61763a7717a2055d932da17c54d2aa65a
Merge: bc168f8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:36:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new1
# Conflicts:
# src/common/components/EditableSpan/index.jsx
# src/components/AddAssistCheck/index.jsx
commit bc168f83ebf63ee86423e649ec6fbe4b57e887c5
Merge: 3559798 6d55c59
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:34:30 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new1
commit 3559798c04e69583c1f05fc9125c812a9933892f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:31:13 2019 +0800
既往史下拉滚动条添加
commit e3ba8dd3de2b65773fe5b23f21c53828f524ee66
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 17:22:01 2019 +0800
修改请求地址
commit 1dd6c92d11d79023b65a15e12b2e92566cf08554
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 17:16:22 2019 +0800
辅检横向滚动
commit 461e1db27e39068ca7126b0ad04e756c31f74d74
Merge: adc853a 45b1158
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 16:53:11 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1
# Conflicts:
# src/utils/config.js
commit cf97be2f425bdef386a137e92929969c321ab047
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:08:25 2019 +0800
去掉一个字
commit 1a8521d3c3019063a3124a142e3241f84b43c409
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 16:01:26 2019 +0800
bug
commit 45b1158b6f5a13eb0b02560087f3b936f6449089
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 15:58:40 2019 +0800
其他史高血压选中bug修改
commit 4309f693fc8f37f77ab690b80c043f6abb2eaaae
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 15:16:32 2019 +0800
删除项有问题
commit ac64b868290f94c0a30e3242110a38cda67249eb
Merge: d2eca9d 1a6bf74
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:59:26 2019 +0800
Merge branch 'dev/liucf' into dev/luolei
commit b7259ea8586061ab0b2757add5dc4f06a66ebccd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 14:51:07 2019 +0800
文本模式其他史不受主诉为空限制，切换模式后其他史重新获取
commit d2eca9d801e445d624c6a5465319e6e1335dbd15
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 14:43:46 2019 +0800
日期bug
commit 38f972082b4a6b58e73f17d4d15302045cd48981
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:46:29 2019 +0800
请求地址修改-刚才反了
commit 70e9420d59b745c59f3abe04c33100777184d024
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:44:13 2019 +0800
请求地址修改
commit 9adc82fa986b7008a8779bcc7ff31ebee1e3419f
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 13:39:05 2019 +0800
打印图标
commit 5b61311cda0fea2ec7212aae7bac05ac19b7abbd
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:31:48 2019 +0800
其他史高血压数据展开
commit 0e0487bb164b1d2f2d87c8d495ffcaefb4ade753
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 11:00:06 2019 +0800
查体type修改
commit f163535cc31ed9efbccc673325ee32d043c9c5bf
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:58:27 2019 +0800
查体type修改
commit c9dd7fca3d2c5acc0ebbe5cd0be07c1953d144a2
Merge: 4b8aa34 540b6a8
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:51:52 2019 +0800
Merge branch 'dev/new' into dev/luolei
commit 4b8aa34cd5079f02d2f795956c6eede48ef8889b
Author: Luolei <16657115156@163.com>
Date: Wed Jan 23 10:47:15 2019 +0800
搜索弹窗被遮挡问题解决
commit 540b6a87ef22fe852906af690ee5fb848ae36b8c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:23:04 2019 +0800
地址临时修改
commit f7e9886bd3e9051847f88bedd9c0d3b88011a270
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:20:05 2019 +0800
版本信息弹窗高度限制
commit 7eb5f4651cff007620e9b488f83ad7049e95a3d0
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 10:13:40 2019 +0800
推送接口主诉现病史合并，治疗方案容错
commit 2c6c28b79b9391aa719af6ee0ec369557de36e99
Merge: 4a897b4 5a39d90
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:50 2019 +0800
Merge remote-tracking branch 'origin/dev/new' into dev/new
commit 4a897b473cda81f614a8fd820a6d480b98f9872d
Merge: 7f1c7c8 abd1267
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:57:43 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/common/components/ItemBox/index.jsx
# src/components/AddInspect/index.jsx
# src/components/Diagnosis/index.jsx
# src/components/Diagnosis/index.less
commit 5a39d90dd616740bce7e833646a455b713f5e579
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:52:01 2019 +0800
层级问题
commit b48fcd8197b1b67afc16821bca6dba4fbc2ac4df
Merge: e5d0122 7f1c7c8
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:34 2019 +0800
Merge branch 'dev/new' of http://192.168.2.236:10080/zhouna/newICSS into dev/new
commit e5d0122382957b2f9157a83b72adfb651b355f96
Author: liucf <liucf@zjlantone.com>
Date: Wed Jan 23 09:43:21 2019 +0800
11
commit 7f1c7c87f51c98196ea3994493075055a0a55c4a
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:39:50 2019 +0800
修改请求地址
commit f14d699d86b98edde58a5739d5c81f538dd8bb18
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:38:05 2019 +0800
修改请求地址
commit b14968d42d5ed583714b5941365dc97fe24ea61b
Merge: df67559 a82d18c
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:50 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
commit df67559cc42c79c6ed6b27254ce12178918e32b0
Merge: ff817bf 6805811
Author: zhouna <zhouna@zjlantone.com>
Date: Wed Jan 23 09:26:39 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit 68058110e041e72b8c95979a4fd23e690912746b
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:43:26 2019 +0800
遮罩统一0.6透明度
commit 625ca181024a268f16f32eb2773ea337cf62db43
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 20:34:59 2019 +0800
透明度ie8
commit abd1267cdd8d934f11e89b9fa7b801f8a6962b26
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:24:39 2019 +0800
修改治疗方案无内容按钮置灰
commit c54c73fe39e5746c1e1f2b16924e259cc122620a
Merge: 9c0e078 84ec971
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 20:09:22 2019 +0800
merge from 'lcf'
commit 9c0e0788ab3028ca68edea25dec003daea9f8c8e
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 19:01:31 2019 +0800
修改药品说明样式
commit ff817bf6d6d928b98557371362374859bec3aabd
Merge: d50ffe0 b2e679a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:52:34 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
commit b2e679a35e0ff4831f689758eb14521541f967e2
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:50:45 2019 +0800
导入ie8暂时先灰掉
commit d50ffe0c27db60a72a1dacf87ee96c031eab365b
Merge: 573f0b5 b286d0a
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:25:09 2019 +0800
Merge remote-tracking branch 'origin/dev/otherHis' into dev/new
# Conflicts:
# src/utils/config.js
commit b286d0a89df15fcd3a92bce1e6828a050c1f085e
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 16:23:57 2019 +0800
文本模式ie8onInput存值，搜索下拉项样式
commit a82d18cfa4a27bb855651ef9f6965844d891fab2
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 15:30:07 2019 +0800
修改开单项到医嘱逗号
commit 573f0b59ff517de16f94296240572544e31c9f46
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:23:46 2019 +0800
合并后报错处理
commit 94ba0d8f280352800d8f9a318cc11db58a50fa0f
Merge: 55d15d6 fbab9de
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:18:22 2019 +0800
Merge remote-tracking branch 'origin/dev/liucf' into dev/new
# Conflicts:
# src/components/CurrentIll/index.jsx
# src/containers/EditableSpan.js
# src/store/actions/currentIll.js
# src/store/reducers/checkBody.js
# src/utils/ajax.js
# src/utils/config.js
commit 55d15d6d14ad82b6b607f0d9e39a4b04cf5b4848
Merge: 2d40e6e ad68815
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:10:38 2019 +0800
Merge remote-tracking branch 'origin/dev/zhangxc' into dev/new
# Conflicts:
# src/components/MainSuit/index.jsx
commit 5e7834e1ff17257abdf408037031c0d926d22bfc
Author: zhouna <zhouna@zjlantone.com>
Date: Tue Jan 22 15:02:18 2019 +0800
ie8的onInput代替函数
commit ad688156064254d6b615284642882ba5486ff764
Author: zhangxc <zhangxc@zjlantone.com>
Date: Tue Jan 22 10:29:36 2019 +0800
init
commit 2d40e6e0b4f1e01bfa66db6fb410d77565ee80f0
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:13:57 2019 +0800
updata pro
commit 26649f42178c7177ee34dae46038ce2370bf5b26
Author: Luolei <16657115156@163.com>
Date: Tue Jan 22 10:12:21 2019 +0800
test
commit 0dd720981dd0439560d143288ad3eca97fada9b2
Author: liucf <liucf@zjlantone.com>
Date: Mon Mar 4 09:29:01 2019 +0800
光标没有落入span禁止默认事件
# Conflicts:
# src/components/AddAssistCheck/Textarea/index.jsx
# src/components/DiagResultSearch/index.less
# src/components/Operation/index.jsx
# src/components/PreviewBody/index.jsx
# src/store/async-actions/diagnosticSearch.js
# src/store/async-actions/homePage.js
# src/utils/tools.js
liucf
+ 9
- 0
src/common/components/EditableSpan/index.jsx
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
+ 2
- 1
src/store/actions/currentIll.js
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||