diff --git a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
index 73befda..65e9305 100644
--- a/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
+++ b/zr-cloud/zr-modules/zr-schsf/src/main/java/com/chinagas/modules/schsf/controller/McVisitController.java
@@ -81,10 +81,44 @@ public class McVisitController extends BaseController {
     public AjaxResult add(@RequestBody McVisit mcVisit) {
         AjaxResult paramValidate = getMcVisitValidate(mcVisit);
         if (paramValidate != null) return paramValidate;
+        mcVisit.setId(null);
         return toAjax(mcVisitService.insertMcVisit(mcVisit));
     }
 
     private AjaxResult getMcVisitValidate(McVisit mcVisit) {
+        if (StringUtils.isEmpty(mcVisit.getHasDm()) || !mcVisit.getHasDm().equals(YesNoEnums.Y.getName()) ){
+            //非决策人信息
+            mcVisit.setHasDm("N");
+            mcVisit.setDmAge(null);
+            mcVisit.setDmIncomeSrc(null);
+            mcVisit.setDmPhone(null);
+        }
+        if (StringUtils.isEmpty(mcVisit.getIsCharged()) || !mcVisit.getIsCharged().equals(YesNoEnums.Y.getName()) ){
+            //不是收费
+            mcVisit.setUserCode(null);
+            mcVisit.setUserIdCard(null);
+            mcVisit.setInvoiceNo(null);
+            mcVisit.setChargeAmt(null);
+            mcVisit.setPaymentMeth(null);
+            mcVisit.setChargeType(null);
+        }
+        if (StringUtils.isEmpty(mcVisit.getIsVisited()) || !mcVisit.getIsVisited().equals(YesNoEnums.Y.getName()) ){
+            //不是拜访
+            mcVisit.setIsIntent(null);
+            mcVisit.setHouseCondition(null);
+            mcVisit.setCurrentCookingEnergy(null);
+            mcVisit.setCurrentHeatingEnergy(null);
+            mcVisit.setFamilyMembers(null);
+            mcVisit.setFridgeStatus(null);
+            mcVisit.setAcStatus(null);
+            mcVisit.setTvStatus(null);
+            mcVisit.setWasherStatus(null);
+            mcVisit.setWaterHeaterStatus(null);
+            mcVisit.setPvSystemStatus(null);
+        }
+        if (StringUtils.isEmpty(mcVisit.getIsCharged()) && StringUtils.isEmpty(mcVisit.getIsVisited()) ) {
+            return AjaxResult.error("是否拜访 与 是否收费 不可同时为空");
+        }
         if (BeanUtil.isEmpty(mcVisit)) {
             return AjaxResult.error("参数不可为空");
         }
--
libgit2 0.21.2