提交merge1.3

openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java

@@ -3,6 +3,7 @@ package com.openhis.medication.domain;
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
@@ -173,4 +174,13 @@ public class MedicationDefinition extends HisBaseEntity {
      */
     private String dosageInstruction;
 
+<<<<<<< HEAD
+=======
+    /**
+     * 药品69码
+     */
+    @TableField("drug_69_code")
+    private String drug69Code;
+
+>>>>>>> v1.3
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDetail.java

@@ -14,8 +14,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
-
 /**
  * 药品信息详情
  *
@@ -220,4 +218,12 @@ public class MedicationDetail extends HisBaseEntity {
      */
     private String dosageInstruction;
 
+<<<<<<< HEAD
+=======
+    /**
+     * 药品69码
+     */
+    private String drug69Code;
+
+>>>>>>> v1.3
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationDispenseServiceImpl.java

@@ -13,11 +13,11 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.enums.DelFlag;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.DateUtils;
 import com.openhis.common.enums.AssignSeqEnum;
 import com.openhis.common.enums.DbOpType;
-import com.openhis.common.enums.DelFlag;
 import com.openhis.common.enums.DispenseStatus;
 import com.openhis.medication.domain.MedicationDispense;
 import com.openhis.medication.domain.MedicationRequest;
@@ -97,12 +97,23 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
         // 设置限制发药时间
         medicationDispense.setLimitTime(limitTime);
 
+<<<<<<< HEAD
         if (DbOpType.INSERT.getCode().equals(dbOpType)) {
             baseMapper.insert(medicationDispense);
         } else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
             baseMapper.update(medicationDispense, new LambdaUpdateWrapper<MedicationDispense>()
                 .eq(MedicationDispense::getMedReqId, medicationRequest.getId()));
         }
+=======
+        baseMapper.insert(medicationDispense);
+
+//        if (DbOpType.INSERT.getCode().equals(dbOpType)) {
+//            baseMapper.insert(medicationDispense);
+//        } else if (DbOpType.UPDATE.getCode().equals(dbOpType)) {
+//            baseMapper.update(medicationDispense, new LambdaUpdateWrapper<MedicationDispense>()
+//                .eq(MedicationDispense::getMedReqId, medicationRequest.getId()));
+//        }
+>>>>>>> v1.3
 
         return medicationDispense.getId();
     }
@@ -325,6 +336,11 @@ public class MedicationDispenseServiceImpl extends ServiceImpl<MedicationDispens
     public List<MedicationDispense> getMedDispenseBySummaryNo(List<String> summaryNoList) {
         return baseMapper
             .selectList(new LambdaQueryWrapper<MedicationDispense>().in(MedicationDispense::getSummaryNo, summaryNoList)
+<<<<<<< HEAD
                 .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode()));
+=======
+                .eq(MedicationDispense::getDeleteFlag, DelFlag.NO.getCode())
+                .eq(MedicationDispense::getStatusEnum, DispenseStatus.SUMMARIZED.getValue()));
+>>>>>>> v1.3
     }
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationRequestServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.openhis.common.enums.DelFlag;
+import com.core.common.enums.DelFlag;
 import com.openhis.common.enums.RequestStatus;
 import com.openhis.medication.domain.MedicationRequest;
 import com.openhis.medication.mapper.MedicationRequestMapper;

openhis-server-new/openhis-domain/src/main/java/com/openhis/medication/service/impl/MedicationServiceImpl.java

@@ -2,8 +2,11 @@ package com.openhis.medication.service.impl;
 
 import java.util.List;
 
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+=======
+>>>>>>> v1.3
 import com.openhis.medication.dto.AdjustPriceMedListDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,7 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.core.common.utils.bean.BeanUtils;
-import com.openhis.common.enums.DelFlag;
+import com.core.common.enums.DelFlag;
 import com.openhis.medication.domain.Medication;
 import com.openhis.medication.domain.MedicationDetail;
 import com.openhis.medication.mapper.MedicationMapper;
@@ -46,7 +49,7 @@ public class MedicationServiceImpl extends ServiceImpl<MedicationMapper, Medicat
         if (!medicationIdList.isEmpty()) {
             // 查询药品相关信息列表并返回
             return baseMapper.selectList(new LambdaQueryWrapper<Medication>()
-                .eq(Medication::getDeleteFlag, DelFlag.NO.getValue()).in(Medication::getId, medicationIdList));
+                .eq(Medication::getDeleteFlag, DelFlag.NO.getCode()).in(Medication::getId, medicationIdList));
         }
         return null;
     }