add 自控次数

nb-api/pom.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>nb-root</artifactId>
+        <groupId>com.tuoren</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>nb-api</artifactId>
+
+
+</project>

nb-system/src/main/java/com/nb/bus/entity/BusInfusionModifyEntity.java

@@ -93,8 +93,8 @@ public class BusInfusionModifyEntity extends TenantGenericEntity<String,String>
     @ApiModelProperty(value = "公共参数-自控锁时",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     private Integer selfControlLockTime;
 
-    @ApiModelProperty(value = "公共参数-自控次数",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
-    private Integer selfControlCount;
+//    @ApiModelProperty(value = "公共参数-自控次数",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
+//    private Integer selfControlCount;
 
     @ApiModelProperty(value = "公共参数-pca有效次数",accessMode = ApiModelProperty.AccessMode.READ_ONLY)
     private Integer pcaValidCount;
@@ -172,7 +172,7 @@ public class BusInfusionModifyEntity extends TenantGenericEntity<String,String>
         entity.setAppendDose(running.getAppendDose());
         entity.setMaxDose(running.getMaxDose());
         entity.setSelfControlLockTime(running.getSelfControlLockTime());
-        entity.setSelfControlCount(running.getSelfControlCount());
+//        entity.setSelfControlCount(running.getSelfControlCount());
         entity.setPcaValidCount(running.getPcaValidCount());
         entity.setPcaInvalidCount(running.getPcaInvalidCount());
         entity.setPcaTotalCount(running.getPcaTotalCount());

nb-system/src/main/java/com/nb/bus/service/dto/PatientMonitorResult.java

@@ -92,8 +92,8 @@ public class PatientMonitorResult implements Serializable {
     @ApiModelProperty(value = "公共参数-自控锁时")
     private BigDecimal selfControlLockTime;
 
-    @ApiModelProperty(value = "公共参数-自控次数")
-    private BigDecimal selfControlCount;
+//    @ApiModelProperty(value = "公共参数-自控次数")
+//    private BigDecimal selfControlCount;
 
     @ApiModelProperty(value = "公共参数-pca有效次数")
     private Integer pcaValidCount;

nb-system/src/main/java/com/nb/bus/utils/MockUtils.java

@@ -28,7 +28,7 @@ public class MockUtils {
         pump.setAppendDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
         pump.setAppendLockTime(BigDecimal.valueOf(RandomUtil.randomInt(100)));
         pump.setMaxDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));
-        pump.setSelfControlCount(RandomUtil.randomInt(100));
+//        pump.setSelfControlCount(RandomUtil.randomInt(100));
         pump.setSelfControlLockTime(RandomUtil.randomInt(100));
         pump.setFirstDose(RandomUtil.randomInt(100));
         pump.setRemainDose(BigDecimal.valueOf(RandomUtil.randomInt(100)));

nb-system/src/main/resources/mapper/bus/BusPatientMapper.xml

@@ -44,7 +44,7 @@
         <result column="append_dose" property="appendDose"/>
         <result column="append_lock_time" property="appendLockTime"/>
         <result column="max_dose" property="maxDose"/>
-        <result column="self_control_count" property="selfControlCount"/>
+        <!--<result column="self_control_count" property="selfControlCount"/>-->
         <result column="self_control_lock_time" property="selfControlLockTime"/>
         <result column="pca_valid_count" property="pcaValidCount"/>
         <result column="pca_invalid_count" property="pcaInvalidCount"/>

pom.xml

@@ -48,6 +48,7 @@
         <module>nb-common</module>
         <module>nb-system</module>
         <module>nb-oss</module>
+        <module>nb-api</module>
     </modules>
 
     <dependencies>