后端最新版本同步

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceDispense.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -48,7 +49,7 @@ public class DeviceDispense extends HisBaseEntity {
     private Integer dispenseCategoryEnum;
 
     /** 发放数量 */
-    private Integer quantity;
+    private BigDecimal quantity;
 
     /** 发放单位 */
     private String unitCode;
@@ -78,11 +79,14 @@ public class DeviceDispense extends HisBaseEntity {
     private String partTypeCode;
 
     /** 已发药数量 */
-    private Integer dispenseQuantity;
+    private BigDecimal dispenseQuantity;
 
     /** 发药频次 */
     private String dispenseFrequencyCode;
 
+    /** 配药人 */
+    private Long preparerId;
+
     /** 配药时间 */
     private Date prepareTime;
 

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/DeviceRequest.java

@@ -62,7 +62,7 @@ public class DeviceRequest extends HisBaseEntity {
     private String deviceTypeCode;
 
     /** 请求数量 */
-    private Integer quantity;
+    private BigDecimal quantity;
 
     /** 请求单位编码 */
     private String unitCode;

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ServiceRequest.java

@@ -1,5 +1,6 @@
 package com.openhis.workflow.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -64,7 +65,7 @@ public class ServiceRequest extends HisBaseEntity {
     private Long activityId;
 
     /** 数量 */
-    private Integer quantity;
+    private BigDecimal quantity;
 
     /** 单位 */
     private String unitCode;
@@ -152,4 +153,14 @@ public class ServiceRequest extends HisBaseEntity {
      */
     private String signCode;
 
+    /**
+     * 用药频次
+     */
+    private String rateCode;
+
+    /**
+     * 父id | 适用诊疗套餐
+     */
+    private Long parentId;
+
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/mapper/ActivityDefinitionMapper.java

@@ -21,7 +21,7 @@ public interface ActivityDefinitionMapper extends BaseMapper<ActivityDefinition>
      * @param activityName 诊疗名称
      * @return 诊疗定义id
      */
-    Long getAppointActivityDefinitionId(@Param("skinTestInspection") String skinTestInspection,
+    Long getAppointActivityDefinitionId(@Param("activityName") String activityName,
         @Param("status") Integer status);
 
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/IDeviceDispenseService.java

@@ -1,5 +1,6 @@
 package com.openhis.workflow.service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -61,7 +62,7 @@ public interface IDeviceDispenseService extends IService<DeviceDispense> {
      * @param quantity 发药数量
      */
     DeviceDispense createCompletedDeviceDispense(DeviceDispense deviceDispense, Date now, Practitioner loginUser,
-        String step, Integer quantity);
+        String step, BigDecimal quantity);
 
     /**
      * 器材发放状态：已发药

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/DeviceDispenseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.openhis.workflow.service.impl;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Date;
@@ -76,7 +77,7 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
         // 支持用药信息
         deviceDispense.setSupportInfo(deviceRequest.getSupportInfo());
         // 已发药数量
-        deviceDispense.setDispenseQuantity(0);
+        deviceDispense.setDispenseQuantity(BigDecimal.ZERO);
         // 发药频次
         deviceDispense.setDispenseFrequencyCode(deviceRequest.getRateCode());
 
@@ -143,7 +144,7 @@ public class DeviceDispenseServiceImpl extends ServiceImpl<DeviceDispenseMapper,
      */
     @Override
     public DeviceDispense createCompletedDeviceDispense(DeviceDispense deviceDispense, Date now, Practitioner loginUser,
-        String step, Integer quantity) {
+        String step, BigDecimal quantity) {
         // 服务请求编码
         deviceDispense.setBusNo(deviceDispense.getBusNo() + "." + step);
         // 请求基于什么

openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/service/impl/ServiceRequestServiceImpl.java

@@ -1,5 +1,6 @@
 package com.openhis.workflow.service.impl;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -96,7 +97,7 @@ public class ServiceRequestServiceImpl extends ServiceImpl<ServiceRequestMapper,
         // 请求基于什么的ID
         serviceRequest.setBasedOnId(serviceRequest.getId());
         // 数量
-        serviceRequest.setQuantity(1);
+        serviceRequest.setQuantity(new BigDecimal("1"));
         // 状态
         serviceRequest.setStatusEnum(RequestStatus.COMPLETED.getValue());
         // 执行人