fix:

修改了一些bug

nb-service-api/web-service-api/src/main/java/com/nb/web/api/enums/DeviceAlarmEnum.java

@@ -30,7 +30,7 @@ public enum DeviceAlarmEnum  implements IEnum<Integer> {
     Limit(5,"极限报警"),
     Finished(6,"输液结束"),
     LowBattery(7,"电量耗尽报警"),
-//    OutOfControl(8,"电机失控报警"),
+    OutOfControl(8,"电机失控报警"),
     Machine(9,"机械故障"),;
 
 

nb-service/app-assistant/src/main/java/com/nb/app/assistant/controller/PatientOperationController.java

@@ -89,7 +89,7 @@ public class PatientOperationController {
      */
     @PostMapping("/edit/name")
     @ApiOperation("修改病人备注")
-    public R editPatientNamePs(@RequestBody@Validated EditPatientNameVO source){
+    public R<Boolean> editPatientNamePs(@RequestBody@Validated EditPatientNameVO source){
         log.info("看护人修改绑定关系,{}",JSONUtil.toJsonStr(source));
         AssistantUserBindEntity updateSource = new AssistantUserBindEntity();
         updateSource.setId(source.getId());
@@ -107,7 +107,7 @@ public class PatientOperationController {
      */
     @PostMapping("/edit")
     @ApiOperation("修改绑定关系")
-    public R edit(@RequestBody@Validated EditAssistBindDto source){
+    public R<Boolean> edit(@RequestBody@Validated EditAssistBindDto source){
         log.info("看护人修改绑定关系,{}",JSONUtil.toJsonStr(source));
         return R.success(userBindService.update(source));
     }

nb-service/web-service/src/main/resources/mapper/bus/BusInfusionHistoryMapper.xml

@@ -594,7 +594,10 @@
             <if test="query.warnAnalgesicPoor == true">and warn_analgesic_poor=1 </if>
             <if test="query.warnLowBattery == true"> and warn_low_battery=1 </if>
             <if test="query.warnFlow !=null">
-                and warn_flow= #{query.warnFlow}
+                and warn_flow in
+                <foreach item="warn" index="index" collection="query.warnFlow" open="(" separator="," close=")">
+                    #{warn, jdbcType=VARCHAR}
+                </foreach>
             </if>
             <if test="query.deviceRunState != null">
                 and run_state = #{query.deviceRunState}