2
0

2 Коммиты c10e0a1c48 ... 4b188b9bb7

Автор SHA1 Сообщение Дата
  cb 4b188b9bb7 Merge remote-tracking branch 'origin/his/yiwufuyou_new' into his/yiwufuyou_new 4 месяцев назад
  cb a0a0d2a598 母婴同室婴儿病例仍然质控bug修复,更新婴儿标识接口优化 4 месяцев назад
1 измененных файлов с 3 добавлено и 6 удалено
  1. 3 6
      src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

+ 3 - 6
src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -5,12 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABehospitalInfoDTO;
-import com.diagbot.entity.BasDeptInfo;
 import com.diagbot.entity.BehospitalInfo;
-import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.QcType;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.mapper.BehospitalInfoMapper;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
@@ -22,7 +19,6 @@ import com.diagbot.vo.data.ABehospitalInfoVO;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.APlaceFileVO;
 import com.google.common.collect.Lists;
-import com.sun.xml.bind.v2.TODO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -30,7 +26,6 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -181,7 +176,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
      */
     private Long initQcTypeId(BehospitalInfo s) {
         // 如果是婴儿(isBaby = 1),直接返回0,不进行质控
-        if (s.getIsBaby().equals(1)) {
+        if (s.getIsBaby().equals("1") || s.getName().contains("之子") || s.getName().contains("之女")) {
             return 0L;
         }
         Long qcTypeId = Long.valueOf("0");
@@ -402,6 +397,8 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                         .eq("is_deleted",IsDeleteEnum.N)
                         .in("behospital_code", isPlaceFileInfoList)
                         .set("is_baby","1")
+                        //婴儿标志为1的新生儿不进行质控
+                        .set("qc_type_id","0")
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new BehospitalInfo(),updateWrapper);