合并dev/icss,并且解决冲突

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -138,14 +138,21 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             inquiryScaleFacade.removeByInquiryId(inquiryId);
         }
 
+
         Long inquiryId_=inquiryId;
 
+        List<String> contentList = new ArrayList<>();
         if(ListUtil.isNotEmpty(saveInquiryVO.getDetailList())){
-            List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(),InquiryDetail.class);
-            inquiryDetailList.forEach(i->{
-            	i.setInquiryId(inquiryId_);
-            	i.setGmtCreate(now);
-            });
+            List<InquiryDetail> inquiryDetailList = new ArrayList<>();
+            for (SaveInquiryDetailVO i : saveInquiryVO.getDetailList()) {
+                InquiryDetail inquiryDetail = new InquiryDetail();
+                BeanUtil.copyProperties(i, inquiryDetail);
+                inquiryDetail.setInquiryId(inquiryId_);
+                inquiryDetail.setGmtCreate(now);
+                inquiryDetailList.add(inquiryDetail);
+                contentList.add(i.getContentValue());
+            }
+
             inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
         }
 
@@ -176,7 +183,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         	}
         }
 
-        saveInquiryDTO.setInquiryId(inquiryId);
+        saveInquiryDTO.setInquiryId(inquiryId_);
 
         SaveInquiryToHisVO saveInquiryToHisVO = new SaveInquiryToHisVO();
         saveInquiryToHisVO.setContentList(contentList);

icss-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -93,7 +93,7 @@ public class LisMappingFacade extends LisMappingServiceImpl {
      * @return
      */
     public Map<String,Map<String,String>> getLisMappingByQuestion(String project,List<String> details){
-        Map<String,Map<String,String>> lisWithItemNamMap=getLisMapping();
+        Map<String,Map<String,String>> lisWithItemNamMap=getLisMapping_NotEmptyItemName();
         Map<String,String> lisWithoutItemNameMap=getLisMappingWithoutItemName();
 
         if(StringUtil.isBlank(project)){

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -21,7 +21,6 @@ import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.ScaleDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
-import com.diagbot.entity.EvaluationModuleMapping;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.ScaleContent;
 import com.diagbot.enums.DisTypeEnum;