|
@@ -1685,10 +1685,10 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
|
|
|
tvNurseTimeOut.setText("");
|
|
|
//呼叫超时倒计时开启
|
|
|
callTypeCallNurse = "2";
|
|
|
- if (CALL_STATUS.equals(Constants.STANDBY)) {
|
|
|
+ if (CALL_STATUS.equals(Constants.STANDBY) || CALL_STATUS.equals(NURSE_CALL_TIMEOUT)) {
|
|
|
callNurse();
|
|
|
handsMICStatus = setHandsMIC(serialPortUtil, true);
|
|
|
- } else if (CALL_STATUS.equals(Constants.IN_CALLING) || CALL_STATUS.equals(NURSE_CALL_TIMEOUT)) {
|
|
|
+ } else if (CALL_STATUS.equals(Constants.IN_CALLING)) {
|
|
|
endCallNurse();
|
|
|
handsMICStatus = setHandsMIC(serialPortUtil, false);
|
|
|
}
|