Squashed commit of the following:

commit d847155e9a5ef0aa19dc30be15a759ff9cf8a8ed
Author: liucf <liucf@zjlantone.com>
Date:   Fri May 24 09:51:21 2019 +0800

    Squashed commit of the following:

    commit e4ca9e3bc1c0d6f708663d725f48591d701752ef
    Merge: 86bd4b8 da90698
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri May 24 09:22:20 2019 +0800

        Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

    commit 86bd4b8e3233faa8649164435135b29314c69a1c
    Author: liucf <liucf@zjlantone.com>
    Date:   Fri May 24 09:22:07 2019 +0800

        化验辅检删除按钮位置调整

    commit da906981559866adf705b290d26e63e1c6c05234
    Merge: 1b23456 f759743
    Author: Luolei <16657115156@163.com>
    Date:   Thu May 23 17:39:00 2019 +0800

        Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

    commit 1b23456c8c6e0514046d51a126a0f30b93a256fd
    Author: Luolei <16657115156@163.com>
    Date:   Thu May 23 17:38:51 2019 +0800

        填写单样式修改

    commit f920688d6d06addcc52bea3bfeb2dc05a0565395
    Merge: 58358ba f759743
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 23 17:38:50 2019 +0800

        Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

    commit 58358ba0104e1f24628a66bfd7f3b146701d8110
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 23 17:36:08 2019 +0800

        输入框类型

    commit f759743e561e3cf776b93ef14258b3e693b9a035
    Merge: 91ed545 cc5b362
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 23 16:58:24 2019 +0800

        Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

    commit 91ed54558836599411a4d08d6292584f9dc445a5
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 23 16:58:08 2019 +0800

        右侧推送诊断添加静态信息

    commit cc5b3627e6d0cdf39045abf2cc6dcf4090d20a4d
    Author: Luolei <16657115156@163.com>
    Date:   Thu May 23 16:56:47 2019 +0800

        鼠标的显示类型

    commit 7fc50f5228919afb9244893c538c514e00f9b51f
    Merge: 1b8ea52 d6f02ce
    Author: Luolei <16657115156@163.com>
    Date:   Thu May 23 16:45:29 2019 +0800

        Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

    commit 1b8ea52cf32e00fecc832351931580186eef366b
    Author: Luolei <16657115156@163.com>
    Date:   Thu May 23 16:45:19 2019 +0800

        日期组件详细看看

    commit d6f02cebbf2649288b59b61cdf906d18a4fef384
    Author: liucf <liucf@zjlantone.com>
    Date:   Thu May 23 15:49:23 2019 +0800

        化验辅检删除修改完成

    commit d751e8c8bd8ef407c2b6a865cb9aa27cfe1ea1c6
    Author: zhangxc <zhangxc@zjlantone.com>
    Date:   Thu May 23 15:00:55 2019 +0800

        辅检删除弹窗关闭

commit 866f27ade9b0031a58a5be5debe9ced885e020c2
Merge: 08ffb5c df665db
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 23 14:18:22 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

commit 08ffb5c9c8933d5f9acefb1466158665761dc33a
Merge: 425f640 2882d5c
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 23 11:38:18 2019 +0800

    Merge remote-tracking branch 'origin/dev/new1' into dev/new1

commit 425f6409012bb29f2c8292c65c1745657014cb42
Merge: 0206032 3e2cb6d
Author: zhouna <zhouna@zjlantone.com>
Date:   Thu May 23 11:37:57 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

commit 2882d5c80b9028a8298bca9e31e5ac823fd52507
Merge: 0206032 3e2cb6d
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 23 11:37:33 2019 +0800

    Merge branch 'ChronicMag' into dev/new1

commit 020603249704e611180d53cf308745456b7bf189
Merge: 003d2e3 e27b5b0
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 23 11:30:31 2019 +0800

    Merge branch 'ChronicMag' into dev/new1

commit 003d2e323da21cc9ddd0b1b437a0fe3e930d4919
Merge: 0416dcf e1e807f
Author: zhouna <zhouna@zjlantone.com>
Date:   Wed May 22 14:08:47 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

commit 0416dcf749cb5d43c7a410f907b020bc871c3bb6
Merge: c4b1f72 be3d145
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 21 13:39:31 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

commit c4b1f723591e0b4aaa53afdd7aa5aa0d088dadd1
Merge: 17a3a30 dac6a83
Author: zhouna <zhouna@zjlantone.com>
Date:   Mon May 20 16:53:19 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

commit 17a3a30e2f47acfabf1bd26362500a29c2e375fc
Merge: bbc3834 aecc6ad
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 17 16:55:43 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

commit bbc38343b885f92f21b8276242cb9d2e67363494
Merge: c9c6997 f855d74
Author: zhouna <zhouna@zjlantone.com>
Date:   Fri May 17 16:24:16 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

commit c9c6997300dbb6492dc75b9329bed176371708f6
Merge: f91379a 7fb7be2
Author: zhangxc <zhangxc@zjlantone.com>
Date:   Thu May 16 16:22:19 2019 +0800

    Merge branch 'ChronicMag' into dev/new1

commit f91379a215dcecd3f9c67f1b81dbab0db9f07dc6
Author: liucf <liucf@zjlantone.com>
Date:   Wed May 15 17:33:31 2019 +0800

    Squashed commit of the following:

    commit f3c8426e8061f7f24420c3f7053cd60d2e2a9a57
    Author: liucf <liucf@zjlantone.com>
    Date:   Wed May 15 17:31:22 2019 +0800

        主诉通用特征描述打标处理

    commit 58f43657547bbc2845b68d5e5968c491f9d4db9c
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed May 15 14:07:55 2019 +0800

        计算公式等小弹窗样式修改1382

    commit 7c86e4edc12ee58ed31bf7d11c20aa5351ce6ee6
    Author: zhouna <zhouna@zjlantone.com>
    Date:   Wed May 15 13:53:10 2019 +0800

        可能结果关闭选项与结果一致

    commit 5cecd2227caba34839470247d67bbcb16beee90c
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 14 19:12:17 2019 +0800

        量表选中项保存

    commit 317b2725f592ced18cc2cfef61528482fa182263
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 14 17:19:07 2019 +0800

        主诉现病史数字键盘双击编辑action修改

commit 42eb676b01505a25f7506f2b5fc665f91db2f934
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 19:14:02 2019 +0800

    Squashed commit of the following:

    commit 5cecd2227caba34839470247d67bbcb16beee90c
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 14 19:12:17 2019 +0800

        量表选中项保存

    commit 317b2725f592ced18cc2cfef61528482fa182263
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 14 17:19:07 2019 +0800

        主诉现病史数字键盘双击编辑action修改

commit 3f41befa6793ddb67cea85d6ba85015caa254e36
Author: liucf <liucf@zjlantone.com>
Date:   Tue May 14 18:41:43 2019 +0800

    合并慢病分支
    Squashed commit of the following:

    commit 317b2725f592ced18cc2cfef61528482fa182263
    Author: liucf <liucf@zjlantone.com>
    Date:   Tue May 14 17:19:07 2019 +0800

        主诉现病史数字键盘双击编辑action修改

commit 3b6279efc73a2cd698794eaad92f68e75d7e4f50
Merge: 2a605c4 fbff267
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 15:10:11 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

commit 2a605c43556b2222a874c3cc2571e85111bc54ec
Merge: e29d746 6bfc279
Author: zhouna <zhouna@zjlantone.com>
Date:   Tue May 14 14:40:44 2019 +0800

    Merge remote-tracking branch 'origin/ChronicMag' into dev/new1

# Conflicts:
#	src/components/AddAssistCheck/index.less
#	src/components/AddInspect/SlideSelect/index.less

src/components/AddAssistCheck/index.less

@@ -65,15 +65,14 @@
             } */
             .closeIcon{
               display: inline-block;
-              width: 25px;
-              height: 25px;
+              width: 15px;
+              height: 15px;
               cursor: pointer;
               position: absolute;
-              right: -3px;
-              top: -2px;
+              right: 2px;
+              top: 2px;
               background: @closeIcon;
-              background-size: 60% 60%;
-              background-position: center;
+              background-size: 100% 100%;
             }
             p{
                 display: inline-block;
@@ -102,8 +101,7 @@
       background:#F2F2F2;
       .closeIcon{
         background: @closeHor;
-        background-size: 60% 60%;
-        background-position: center;
+        background-size: 100% 100%;
       }
     }
 }

src/components/AddInspect/SlideSelect/index.less

@@ -25,18 +25,17 @@
         vertical-align: top;
     } 
     .partDel {
-        width: 25px;
-        height: 25px;
+        width: 15px;
+        height: 15px;
         margin-bottom: 11px;
         cursor: pointer;
         display: inline-block;
         position: absolute;
-        right: -3px;
-        top: 9px;
+        right: 2px;
+        top: 13px;
         // background-color: #fff;
         background: @closeIcon;
-        background-size: 60% 60%;
-        background-position: center;
+        background-size: 100% 100%;
     }
 }
 .slideLi:hover{
@@ -44,8 +43,7 @@
     border-radius: 4px;
        .partDel{
         background: @closeHor;
-        background-size: 60% 60%;
-        background-position: center;
+        background-size: 100% 100%;
       } 
 }
 .staticTagActive {

src/components/AddInspect/index.less

@@ -179,8 +179,8 @@
         width: 15px;
         height: 15px;
         position: absolute;
-        top: -10px;
-        right: -6px;
+        top: -5px;
+        right: -5px;
         z-index: 30;
         border-radius: 50%;
         background: @closeIcon;