Преглед изворни кода

fix(依赖):
远程配置调整

18339543638 пре 2 година
родитељ
комит
7e3bcbb64b

+ 4 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/DeviceConfigurationResult.java

@@ -14,6 +14,7 @@ import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author zsl
@@ -57,4 +58,7 @@ public class DeviceConfigurationResult implements Serializable {
     @ApiModelProperty(value = "设备住院号")
     private String patientCode;
 
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
 }

+ 7 - 4
nb-service/web-service/src/main/resources/mapper/bus/BusDeviceConfigurationMapper.xml

@@ -14,6 +14,7 @@
         <result column="continue_dose" property="continueDose"/>
         <result column="self_control_lock_time" property="selfControlLockTime"/>
         <result column="patient_code" property="patientCode"/>
+        <result column="create_time" property="createTime"/>
 
     </resultMap>
 
@@ -22,14 +23,15 @@
             bdc.id AS id,
             bd.device_id AS device_id,
             bd.alias AS alias,
-            bd.type AS type,
+            bih.type AS type,
             bdc.total_dose as total_dose,
             bdc.first_dose as first_dose,
             bdc.max_dose as max_dose,
             bdc.append_dose as append_dose,
             bdc.continue_dose as continue_dose,
             bdc.self_control_lock_time as self_control_lock_time,
-            bdc.patient_code as patient_code
+            bdc.patient_code as patient_code,
+            bdc.create_time as create_time
         from bus_device as bd left join bus_device_configuration as bdc on bd.remote_config_id = bdc.id
         left join bus_infusion_history as bih on bd.infusion_id = bih.id
         <where>
@@ -56,14 +58,15 @@
         bdc.id AS id,
         bd.device_id AS device_id,
         bd.alias AS alias,
-        bd.type AS type,
+        bih.type AS type,
         bdc.total_dose as total_dose,
         bdc.first_dose as first_dose,
         bdc.max_dose as max_dose,
         bdc.append_dose as append_dose,
         bdc.continue_dose as continue_dose,
         bdc.self_control_lock_time as self_control_lock_time,
-        bdc.patient_code as patient_code
+        bdc.patient_code as patient_code,
+        bdc.create_time as create_time
         from bus_device as bd join bus_device_configuration as bdc on bd.remote_config_id = bdc.id
         left join bus_infusion_history as bih on bd.infusion_id = bih.id
         <where>