web端手术管理增加问答次数，队列数量字段

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizClinicRoomDTO.java

@@ -41,9 +41,6 @@ public class BizClinicRoomDTO extends BaseDTO  {
     @ApiModelProperty(value = "手术结束时间", position = 6)
     private Date clinicEndTime;
 
-    @ApiModelProperty(value = "手术状态", position = 7)
-    private String clinicStatus;
-
     @ApiModelProperty(value = "最后一次随访时间", position = 8)
     private String lastFollowUpTime;
 
@@ -68,9 +65,6 @@ public class BizClinicRoomDTO extends BaseDTO  {
     @ApiModelProperty(value = "上一次看护的时间", position = 21)
     private Date lastCareTime;
 
-    @ApiModelProperty(value = "泵信息", position = 23)
-    private Object pumpInfo;
-
     @ApiModelProperty(value = "患者头像", position = 24)
     private String imageUrl;
 
@@ -92,4 +86,11 @@ public class BizClinicRoomDTO extends BaseDTO  {
     @ApiModelProperty(value = "术前问卷填写")
     private boolean questionFlag=Boolean.TRUE;
 
+    @ApiModelProperty(value = "队列数量")
+    private Integer queueCount;
+
+    @ApiModelProperty("应答次数")
+    private Integer answerCount;
+
+
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizClinicRoomPO.java

@@ -110,4 +110,10 @@ public class BizClinicRoomPO extends TenantPO {
 
     @TableField(updateStrategy = FieldStrategy.NEVER, fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
     private Integer deleted;
+
+    @ApiModelProperty("队列数量")
+    private Integer queueCount;
+
+    @ApiModelProperty("应答次数")
+    private Integer answerCount;
 }

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

@@ -182,6 +182,9 @@ public class BizQuestionAnswerServiceImpl implements IBizQuestionAnswerService {
         clinicRoom.setLastFollowUpTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
         clinicRoom.setFollowUp(Boolean.TRUE);
         clinicRoom.setLastAfterQuestionTime(new Date());
+        //应答次数加一
+        Integer  answerCount = Optional.ofNullable(clinicRoom.getAnswerCount()).orElse(0);
+        clinicRoom.setAnswerCount(++answerCount);
         clinicRoomRepository.updateById(clinicRoom);
         //消除术后问卷
         clinicRoomUndoService.doneBizClinicRoom(ClinicUndoType.questionGroup,clinicRoom.getId());

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

@@ -47,12 +47,6 @@ public class BizClinicVO extends BaseDTO  {
     @ApiModelProperty(value = "科室名称", position = 7)
     private String deptName;
 
-    @ApiModelProperty(value = "手术开始时间", position = 9)
-    private Date clinicStartTime;
-
-    @ApiModelProperty(value = "手术结束时间", position = 10)
-    private Date clinicEndTime;
-
     @ApiModelProperty("手术状态")
     private String clinicStatus;
 

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizClinicRoomMapper.xml

@@ -252,8 +252,6 @@
         bcr.patient_name as patient_name,
         bcr.patient_age as patient_age,
         bcr.dept_name as dept_name,
-        bcr.clinic_start_time as clinic_start_time,
-        bcr.clinic_end_time as clinic_end_time,
         bcr.clinic_status as clinic_status,
         bcr.follow_up_count as follow_up_count,
         bcr.assess_count as assess_count,