update

身份证校验方式

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizPainAssessmentServiceImpl.java

@@ -116,7 +116,7 @@ public class BizPainAssessmentServiceImpl implements IBizPainAssessmentService {
             clinicRoom.setLastPainAssessmentTime(new Date());
             clinicRoomRepository.updateById(clinicRoom);
             //消除镇痛提醒
-            clinicRoomUndoService.doneBizClinicRoom(ClinicUndoType.questionGroup,source.getClinicId());
+            clinicRoomUndoService.doneBizClinicRoom(ClinicUndoType.assessment,source.getClinicId());
             return Boolean.TRUE;
         }
         return Boolean.FALSE;

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionAnswerServiceImpl.java

@@ -97,7 +97,7 @@ public class BizQuestionAnswerServiceImpl implements IBizQuestionAnswerService {
         clinicRoom.setLastBeforeQuestionTime(new Date());
         clinicRoomRepository.updateById(clinicRoom);
         //消除镇痛提醒
-        clinicRoomUndoService.doneBizClinicRoom(ClinicUndoType.assessment,clinicRoom.getId());
+        clinicRoomUndoService.doneBizClinicRoom(ClinicUndoType.questionGroup,clinicRoom.getId());
         return Boolean.TRUE;
     }
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/vo/BizClinicVO.java

@@ -84,4 +84,16 @@ public class BizClinicVO extends BaseDTO  {
 
     @ApiModelProperty("看护的医生头像")
     private String doctorAvatar;
+
+    @ApiModelProperty("设备id")
+    private String deviceId;
+
+    @ApiModelProperty("运行状态")
+    private String deviceRunState;
+
+    @ApiModelProperty("报警信息")
+    private String deviceAlarm;
+
+    @ApiModelProperty("设备类型")
+    private String deviceType;
 }