Revert "护士执行页面/诊疗页面增加结束日期时间大于当前日期3天进行提示"

This reverts commit e10f5d15ae.
develop/lyx_20241116_yzzf
Xiao Ye 3 months ago
parent b85f3a56b4
commit 056e2f460d
  1. 11
      WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderExecuteMxEditForm.java
  2. 9
      WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderExecuteMxEditForm.xml
  3. 11
      WEB-INF/src/com/his/zy/nursestation/NurseExecuteOrderContainerForm.java

@ -14,7 +14,6 @@ import com.wat.component.DxDateTimePick;
import com.wat.component.DxLabel;
import com.wat.component.DxPanelBar;
import com.wat.component.DxTitlePanel;
import com.wat.component.coolcomponent.DxCoolTextField;
import com.wat.component.datagrid.DxDataGrid;
import com.wat.component.datagrid.event.DataGridCalcFieldListener;
import com.wat.component.datagrid.event.DataGridCellColorListener;
@ -35,7 +34,6 @@ public class PatientOrderExecuteMxEditForm extends WatWebForm {
private DxTitlePanel titlePanel1;
private DxDateTimePick datetimepicker1;
private DxDateTimePick datetimepicker2;
private DxCoolTextField sjfwts;
private DxDataGrid dbgrid1;
private DxPanelBar panelBar1;
private DxLabel label1;
@ -396,15 +394,6 @@ public class PatientOrderExecuteMxEditForm extends WatWebForm {
model.setBeginTime(datetimepicker1.getTime());
model.setEndTime(datetimepicker2.getTime());
sjfwts.setText("");
long sj = datetimepicker2.getTime() - System.currentTimeMillis();
String ts = "0";
if(sj > 0) {
ts = Delphi.format("0",MathUtil.divide(sj, 24*60*60*1000));
}
if(Long.valueOf(ts) >= 3) {
sjfwts.setText("时间范围超过当前日期三天请注意!!!");
}
DxDataManager dao = NurseStationService.getSingleOrderExeMxDao(model);
model.setZyyzSingleOrderExectedMxDao(dao);

@ -17,15 +17,6 @@
</DxPanelBar>
</col>
</row>
<row height="5">
<col>
<DxPanelBar id="panelBar2" border-top="1px solid #b8ced7" size="100,38" unit="%">
<item align="left" autoExtend="false">
<DxCoolTextField id="sjfwts" color="255,0,0" enabled="false" size="350,28" />
</item>
</DxPanelBar>
</col>
</row>
<row height="99">
<col>
<DxDataGrid id="dbgrid1" showfoot="false" size="100,100" unit="%,%">

@ -14,7 +14,6 @@ import com.wat.component.DxButtonPanel;
import com.wat.component.DxCheckBox;
import com.wat.component.DxDateTimePick;
import com.wat.component.DxImageList;
import com.wat.component.DxMessageDlg;
import com.wat.component.DxPanelBar;
import com.wat.component.DxPopGridText;
import com.wat.component.DxTreeView;
@ -33,7 +32,6 @@ import com.wat.core.component.event.WindowEvent;
import com.wat.core.config.DaoCreator;
import com.wat.core.dal.DxDataManager;
import com.wat.core.dal.DxNormalDataManager;
import com.wat.core.util.MathUtil;
import com.wat.delphi.util.Delphi;
public class NurseExecuteOrderContainerForm extends WatWebForm {
@ -651,14 +649,7 @@ public class NurseExecuteOrderContainerForm extends WatWebForm {
selectForm.selectOrder(model);
}
long sj = datetimepicker2.getTime() - System.currentTimeMillis();
String ts = "0";
if(sj > 0) {
ts = Delphi.format("0",MathUtil.divide(sj, 24*60*60*1000));
}
if(Long.valueOf(ts) >= 3) {
dlg.messageDlg("提示:结束日期超过当前日期三天请注意!!!",DxMessageDlg.CONFIRM,100,1);
}
// NurseExecuteOrderFormInterface selectForm = (NurseExecuteOrderFormInterface)container.getSelectedForm();
// selectForm.selectOrder(model);

Loading…
Cancel
Save