 zhangxc
|
cae1aa21ff
Merge branch 'bugFix20190722' into dev/new1
|
5 gadi atpakaļ |
|
zhangxc
|
2200dd7f5b
Merge branch 'bugFix20190722' of http://192.168.2.236:10080/zhouna/newICSS into bugFix20190722
|
5 gadi atpakaļ |
|
zhangxc
|
573948fda5
治疗方案药物大小类名称相同，现在小类名称不会返回（2067）
|
5 gadi atpakaļ |
 luolei
|
d714ec0b47
Merge branch 'bugFix20190722' into dev/new1
|
5 gadi atpakaļ |
|
luolei
|
d25cd5d029
急诊bug修改
|
5 gadi atpakaļ |
 luolei
|
7ffc9fc3f1
按钮文字改变bug
|
5 gadi atpakaļ |
 zhouna
|
27cb704002
Merge remote-tracking branch 'origin/bugFix20190722' into dev/new1
|
5 gadi atpakaļ |
|
zhouna
|
af082eb695
图表数据对应修改2049
|
5 gadi atpakaļ |
|
zhangxc
|
0514649d2c
右侧提示信息图片隐藏（2018）
|
5 gadi atpakaļ |
|
zhouna
|
1583c293b4
鼠标手型bug修改2027
|
5 gadi atpakaļ |
|
zhouna
|
830842ccc2
急诊等切回
|
5 gadi atpakaļ |
|
zhouna
|
38a948cf95
回退急诊前-
|
5 gadi atpakaļ |
|
zhouna
|
3f36f85e9e
Merge remote-tracking branch 'origin/dev/new1' into dev/new1
|
5 gadi atpakaļ |
|
zhouna
|
602b957c9e
回退急诊前-
|
5 gadi atpakaļ |
|
luolei
|
6767599532
Merge branch 'bugFix20190722' into dev/new1
|
5 gadi atpakaļ |
|
luolei
|
5258dd18d2
急诊文本修改
|
5 gadi atpakaļ |
|
zhouna
|
05bf10554b
回退急诊前
|
5 gadi atpakaļ |
|
luolei
|
7b0a93cd01
Merge branch 'bugFix20190722' into dev/new1
|
5 gadi atpakaļ |
|
luolei
|
44e75cd9bd
解决模板保存问题
|
5 gadi atpakaļ |
|
luolei
|
d36b6dc472
急诊流程修改
|
5 gadi atpakaļ |
|
luolei
|
7be6e996d4
导入异常选中按钮文字联动。事件监听条件限制
|
5 gadi atpakaļ |
|
zhouna
|
a483f72577
Merge remote-tracking branch 'origin/bugFix20190722' into dev/new1
|
5 gadi atpakaļ |
|
luolei
|
47bed4fa23
Merge branch 'bugFix20190722' of http://192.168.2.236:10080/zhouna/newICSS into bugFix20190722
|
5 gadi atpakaļ |
|
luolei
|
2d9e6510db
模板保存比对转化成预览比对
|
5 gadi atpakaļ |
 liucf
|
77bbe9e3c0
时间单位组件去掉双击编辑；主诉现病史模板处理tagtype=4类型方法抽离
|
5 gadi atpakaļ |
|
liucf
|
25c7383916
Squashed commit of the following:
|
5 gadi atpakaļ |
|
liucf
|
7e07e345bb
现病史空模板子模板处理
|
5 gadi atpakaļ |
|
liucf
|
a62701df76
Squashed commit of the following:
|
5 gadi atpakaļ |
|
liucf
|
59fb1802ec
Merge branch 'bugFix20190722' of http://192.168.2.236:10080/zhouna/newICSS into bugFix20190722
|
5 gadi atpakaļ |
|
liucf
|
0e26d29f31
时间单位组件1886，现病史子模板保存2010
|
5 gadi atpakaļ |
