Merge branch 'mrman20201130_5.4.1' into debug

# Conflicts:
#	common/src/main/java/com/diagbot/exception/CommonErrorCode.java

common/src/main/java/com/diagbot/exception/CommonErrorCode.java

@@ -12,9 +12,7 @@ public enum CommonErrorCode implements ErrorCode {
     OK("0", "操作成功"),
     FAIL("00000001", "操作失败"),
     RPC_ERROR("00000002", "远程调度失败"),
-    CANCEL_SUCCESSFUL("00000003","解绑成功"),
     CHECK_CONNECTION("00000005","是否解除绑定"),
-    CHECKMAIN_CONNECTION("00000006","解绑成功"),
     SAVE_SUCCESSFUL("00000007","添加成功"),
     ALTER_SUCCESSFUL("00000009","修改成功"),
     PARAM_ERROR("00029999", "%s"), //参数错误

mrman-service/src/main/java/com/diagbot/facade/QcTypeFacade.java

@@ -115,13 +115,13 @@ public class QcTypeFacade extends QcTypeServiceImpl {
                 respDTO.msg = "该质控类型已被" + "\"" + qcTypeMain.getName() + "\"" + "类型绑定，需先将其解绑";
                return respDTO;
                //父类存在关联  一对多给出提示
-            }else if(ListUtil.isNotEmpty(parentList)){
+            }else if(ListUtil.isNotEmpty(parentList)&&1==cancelTypeVO.getOper()){
                 RespDTO respDTO = new RespDTO();
                 respDTO.code = "00000005";
                 respDTO.msg = "该质控类型存在绑定的子类型，需先将其解绑";
                 return respDTO;
             }
-        //如果父类关联子类，同样提示
+    
         }
         //删除关联状态
         if(cancelTypeVO.getCancel() != null && 1 == cancelTypeVO.getCancel()){

mrman-service/src/main/java/com/diagbot/vo/CancelTypeVO.java

@@ -15,4 +15,6 @@ public class CancelTypeVO {
     private Long hospitalId;
     //是否解除相关质控类型绑定(0-不解除 1-解除)
     private Integer cancel = 0;
+    //操作标示(0-修改 1-删除)
+    private Integer oper = 1;
 }