问诊记录保存修改

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

@@ -38,6 +38,7 @@ public class InquiryDetailFacade extends InquiryDetailServiceImpl {
     public void removeByInquiryId(Long inquiryId) {
         QueryWrapper<InquiryDetail> queryWrapper = new QueryWrapper<InquiryDetail>();
         queryWrapper.eq("inquiry_id", inquiryId);
+        queryWrapper.ne("type", 9);
         this.remove(queryWrapper);
     }
 

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

@@ -1,5 +1,17 @@
 package com.diagbot.facade;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.GetEvaluationScalesDTO;
@@ -39,21 +51,8 @@ import com.diagbot.vo.HisInquirysVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.PatientInfoVO;
 import com.diagbot.vo.ReadInquiryVO;
-import com.diagbot.vo.SaveInquiryDetailVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 import com.diagbot.vo.SaveInquiryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 /**
  * @author rengb
@@ -96,19 +95,18 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
      * @param saveInquiryVO
      * @return
      */
-    @Transactional
     public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO) {
         SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
-        Date now = new Date();
+        Date now = DateUtil.now();
 
-        QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        queryWrapper.eq("hospital_id", saveInquiryVO.getHospitalId());
-        queryWrapper.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
-        queryWrapper.eq("doctor_id", saveInquiryVO.getDoctorId());
-        queryWrapper.eq("patient_id", saveInquiryVO.getPatientId());
-        queryWrapper.eq("inquiry_code", saveInquiryVO.getInquiryCode());
-        InquiryInfo inquiryInfo = this.getOne(queryWrapper);
+        QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
+        inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq("hospital_id", saveInquiryVO.getHospitalId());
+        inquiryInfoQe.eq("hospital_dept_id", saveInquiryVO.getHospitalDeptId());
+        inquiryInfoQe.eq("doctor_id", saveInquiryVO.getDoctorId());
+        inquiryInfoQe.eq("patient_id", saveInquiryVO.getPatientId());
+        inquiryInfoQe.eq("inquiry_code", saveInquiryVO.getInquiryCode());
+        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
 
         Long inquiryId = null;
         InquiryInfo inquiryInfoSave = new InquiryInfo();
@@ -139,21 +137,13 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             inquiryScaleFacade.removeByInquiryId(inquiryId);
         }
 
-
         Long inquiryId_ = inquiryId;
-
-        List<String> contentList = new ArrayList<>();
         if (ListUtil.isNotEmpty(saveInquiryVO.getDetailList())) {
-            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());
-            }
-
+            List<InquiryDetail> inquiryDetailList = BeanUtil.listCopyTo(saveInquiryVO.getDetailList(), InquiryDetail.class);
+            inquiryDetailList.forEach(i->{
+            	i.setInquiryId(inquiryId_);
+                i.setGmtCreate(now);
+            });
             inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
         }