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

# Conflicts:
#	mrman-service/src/main/java/com/diagbot/entity/CasesEntryHospital.java

mrman-service/src/main/java/com/diagbot/entity/CasesEntryHospital.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**

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

@@ -16,10 +16,12 @@ import com.diagbot.service.impl.CasesEntryHospitalServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.SqlExecuteUtil;
 import com.diagbot.vo.GetAllByHospitalVO;
 import com.diagbot.vo.InsertByHospitalVO;
 import com.diagbot.vo.UpdateByHospitalVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -36,7 +38,8 @@ import java.util.stream.Collectors;
 @Component
 public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
     @Autowired
-    private CasesEntryHospitalService casesEntryHospitalService;
+    @Qualifier("casesEntryHospitalServiceImpl")
+    private CasesEntryHospitalServiceImpl casesEntryHospitalService;
     @Autowired
     private QcCacesEntryFacade qcCacesEntryFacade;
     @Autowired
@@ -116,6 +119,7 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
         this.remove(casesEntryHospitalQueryWrapper);
         //添加新的
         casesEntryHospitalService.saveBatch(updateByHospitalVO.getCasesEntryHospitals());
+
         return true;
     }