Commit History

Author SHA1 Message Date
  zhouna a483f72577 Merge remote-tracking branch 'origin/bugFix20190722' into dev/new1 6 years ago
  luolei 47bed4fa23 Merge branch 'bugFix20190722' of http://192.168.2.236:10080/zhouna/newICSS into bugFix20190722 6 years ago
  luolei 2d9e6510db 模板保存比对转化成预览比对 6 years ago
  liucf 77bbe9e3c0 时间单位组件去掉双击编辑;主诉现病史模板处理tagtype=4类型方法抽离 6 years ago
  liucf 25c7383916 Squashed commit of the following: 6 years ago
  liucf 7e07e345bb 现病史空模板子模板处理 6 years ago
  liucf a62701df76 Squashed commit of the following: 6 years ago
  liucf 59fb1802ec Merge branch 'bugFix20190722' of http://192.168.2.236:10080/zhouna/newICSS into bugFix20190722 6 years ago
  liucf 0e26d29f31 时间单位组件1886,现病史子模板保存2010 6 years ago
  zhouna f955379732 Merge remote-tracking branch 'origin/dev/new1' into dev/new1 6 years ago
  zhouna daa92a59f8 Merge remote-tracking branch 'origin/bugFix20190722' into dev/new1 6 years ago
  zhouna ae46804dcc 计算公式弹窗关闭bug修改1916 6 years ago
  zhouna 0302f6f3b0 组合标签子标签不可编辑 6 years ago
  zhouna c92de9cff6 Merge remote-tracking branch 'origin/bugFix20190722' into bugFix20190722 6 years ago
  luolei b375dc1d13 Merge branch 'bugFix20190722' into dev/new1 6 years ago
  luolei 3d740fb650 bug:1935,1922,1921,1888,1884 6 years ago
  zhouna 58c790d64f 管理评估图表x轴值bug1311 6 years ago
  luolei d347a8d065 bug 6 years ago
  zhouna 7c133de2aa Merge remote-tracking branch 'origin/bugFix20190722' into dev/new1 6 years ago
  liucf da608d5569 急诊科历史病历1931/1926/1924 6 years ago
  liucf da1e65952a Merge branch 'bugFix20190722' of http://192.168.2.236:10080/zhouna/newICSS into bugFix20190722 6 years ago
  liucf 918c6449f2 急诊全科病历导出名称修改 6 years ago
  zhangxc f81483f25c Merge branch 'bugFix20190722' into optimize-zxc 6 years ago
  zhangxc 11e3cbe8ba Chrome治疗方案组件直接放在root下,放在诊断下面chrome41拖动弹窗下面滚动条也会动(1878) 6 years ago
  zhangxc 68c3f81bf6 注释计算公式结果keyDown事件,Chrome41不支持。key方法(1889) 6 years ago
  zhouna 9d03d513dc 查体展开按钮下移bug1961 6 years ago
  zhouna 20cb527cf0 其他史引用显示文本 6 years ago
  zhouna bc8afa757b Merge remote-tracking branch 'origin/bugFix20190722' into bugFix20190722 6 years ago
  Luolei1992 7ae18780f7 Merge branch 'bugFix20190722' into muban 6 years ago
  Luolei1992 5b6a7820bc 历史病例优化 6 years ago