develop/xl_20241220_yztxz

住院医嘱录入界面:增加“管理医嘱套”功能,与“另存为医嘱套”同一界面,只是默认不弹出新增界面。
另存为医嘱套、管理医嘱套界面:去除医嘱明细新增、修改功能,保留删除、保存功能。
修改后:医嘱只能另存为新医嘱套,不能修改医嘱套明细。
release/20241216_1413
Xiao Ye 1 month ago
parent b36dadcca4
commit 348622857a
  1. 2
      WEB-INF/src/com/his/base/yzt/YztManageContainerWindow.java
  2. 2
      WEB-INF/src/com/his/base/yzt/YztManageContainerWindow.xml
  3. 9
      WEB-INF/src/com/his/base/yzt/YztManageForm.java
  4. 2
      WEB-INF/src/com/his/base/yzt/YztManageForm.xml
  5. 13
      WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderInputForm.java
  6. 2
      WEB-INF/src/com/his/zy/doctorworkstation/PatientOrderInputForm.xml
  7. 5
      release/20241120_1738.text

@ -10,7 +10,7 @@ package com.his.base.yzt; import com.wat.component.DxLabel; import com.wat.comp
/**/
/* 系统自动生成,用于指定时间选择*/
/**/
YztManageForm form = YztManageForm.newWindow(); form.setWinParams("PatientOrderMapper", getWinParams("PatientOrderMapper")); form.setWindow(this); form.setFlag(110); container.setWebForm(form); form.saveAsYzt(); } public void modalFunction(int flag, Object para) { if(flag == 110) { this.doModalCallbackAction(para); this.close(); } } private void panelBar2Action(String command) { }
YztManageForm form = YztManageForm.newWindow(); form.setWinParams("PatientOrderMapper", getWinParams("PatientOrderMapper")); form.setWindow(this); form.setFlag(110); container.setWebForm(form); if(getWinParams("PatientOrderMapper")!=null) { //有传入值才打开保存为医嘱套界面 //用于适配“管理医嘱套”功能 form.saveAsYzt(); } } public void modalFunction(int flag, Object para) { if(flag == 110) { this.doModalCallbackAction(para); this.close(); } } private void panelBar2Action(String command) { }
private void closeAction() { if("true".equals(getWinParams("saveflag"))) { this.doModalCallbackAction(null); } } protected void initEvent() { super.initEvent(); this.addWindowListener(new WindowAdapter(){ public void windowClosed(WindowEvent windowevent) { closeAction(); } }); panelBar2.addActionListener(new ActionListener(){ public void actionPerformed(ActionEvent actionevent) { panelBar2Action(actionevent.getActionCommand()); } });

@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?> <window size="1200,670" title="患者历史就诊界面" controlbutton="false,false,true"> <DxDIVGrid bkcolor="255,255,255" class="LayoutManager" location="0,0" size="100,100" unit="%,%"> <row height="99"> <col> <WatWebContainerPage id="container" size="100,100" unit="%,%" /> </col> </row> <row height="40" location="0,0" size="0,0" unit="px"> <col location="0,0" size="0,0"> <DxPanelBar id="panelBar2" split="false" border-top="1px solid #b8ced7" size="100,38" tabindex="0" unit="%"> <item align="right" command="close" image="/resources/normal/close.png" color="#ffffff" bkcolor="#F16E56" title="关闭" type="button"/> </DxPanelBar> </col> </row> </DxDIVGrid> <datasource> </datasource> </window>
<?xml version="1.0" encoding="UTF-8"?> <window size="1200,800" title="医嘱套管理界面" controlbutton="false,false,true"> <DxDIVGrid bkcolor="255,255,255" class="LayoutManager" location="0,0" size="100,100" unit="%,%"> <row height="99"> <col> <WatWebContainerPage id="container" size="100,100" unit="%,%" /> </col> </row> <row height="40" location="0,0" size="0,0" unit="px"> <col location="0,0" size="0,0"> <DxPanelBar id="panelBar2" split="false" border-top="1px solid #b8ced7" size="100,38" tabindex="0" unit="%"> <item align="right" command="close" image="/resources/normal/close.png" color="#ffffff" bkcolor="#F16E56" title="关闭" type="button"/> </DxPanelBar> </col> </row> </DxDIVGrid> <datasource> </datasource> </window>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -663,6 +663,8 @@ public class PatientOrderInputForm extends WatWebForm implements IYzMbContainer{
panelBar1ordertemplateAction();
}else if("saveAsYzt".equals(command)) {
panelBar1saveAsYztAction();
}else if("manageYzt".equals(command)) {
panelBar1ManageYztAction();
}
}
@ -820,6 +822,15 @@ public class PatientOrderInputForm extends WatWebForm implements IYzMbContainer{
form.showAsModal();
}
/**
* 管理医嘱套
*/
private void panelBar1ManageYztAction() {
YztManageContainerWindow form = YztManageContainerWindow.newWindow();
form.setWinParams("PatientOrderMapper", null);//传空则不能新增。
form.setWindow(this);
form.showAsModal();
}
/**
* 插入医嘱项编码的新医嘱
@ -2319,7 +2330,7 @@ public class PatientOrderInputForm extends WatWebForm implements IYzMbContainer{
boolean result = true;
boolean hascheck = false;
Map<String, String> zbsMap = new HashMap<String, String>();
dbgrid1.delete();
//dbgrid1.delete();
for(int i = 0;i < yztOrdersDao.getRowCount();i++) {
if("1".equals(yztOrdersDao.getCalcFieldValue(i,"select"))) {
hascheck= true;

@ -49,7 +49,7 @@
<item align="left" command="ordertemplate" image="/resources/normal/query.png" color1="#ffffff" bkcolor1="#009900" title="医嘱套引入" type="button"/>
<item align="left" command="cporders" image="/resources/normal/query.png" color1="#ffffff" bkcolor1="#009900" title="临床路径添加" type="button"/>
<item align="left" command="refresh" image="/resources/normal/refresh.png" color1="#ffffff" bkcolor1="#009900" title="刷新" type="button"/>
<item align="left" command="more" menuItems="saveAsYzt:另存为医嘱套,szzxxj:设置频次执行时间,hourtime:设置小时医嘱执行时间,synmemo:同步备注,syntime:同步下嘱时间,synzxtime:同步开始时间,saveAsmb:另存为模板,zpc:周频次补设,czxh:重置顺序,kjllb:抗菌药物申请列表" image="/resources/normal/更多.png" color1="#ffffff" bkcolor1="#009900" title="更多" type="menu"/>
<item align="left" command="more" menuItems="saveAsYzt:另存为医嘱套,manageYzt:管理医嘱套,szzxxj:设置频次执行时间,hourtime:设置小时医嘱执行时间,synmemo:同步备注,syntime:同步下嘱时间,synzxtime:同步开始时间,saveAsmb:另存为模板,zpc:周频次补设,czxh:重置顺序,kjllb:抗菌药物申请列表" image="/resources/normal/更多.png" color1="#ffffff" bkcolor1="#009900" title="更多" type="menu"/>
</DxPanelBar>
</col>
</row>

@ -75,6 +75,11 @@ develop/hrl_20241220_ekblhzlb
...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/xl_20241220_yztxz
住院医嘱录入界面:增加“管理医嘱套”功能,与“另存为医嘱套”同一界面,只是默认不弹出新增界面。
另存为医嘱套、管理医嘱套界面:去除医嘱明细新增、修改功能,保留删除、保存功能。
修改后:医嘱只能另存为新医嘱套,不能修改医嘱套明细。
...........................................................................................................................................
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

Loading…
Cancel
Save