kljk
/
klhis
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

develop/xl_20241119_hszxts

Browse Source 
医嘱审核：医生下嘱时间、开始时间强制要求迟过入院时间1分钟。
护士执行：结束时间超过今日1天提示、2天弹窗。
develop/lyx_20241121_cfhz
Xiao Ye 2 months ago
parent e31fc85061
commit 173976e641
4 changed files with 58 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 40
      WEB-INF/src/com/his/zy/nursestation/NurseExecuteOrderContainerForm.java
  2. 10
      WEB-INF/src/com/his/zy/nursestation/NurseExecuteOrderContainerForm.xml
  3. 14
      WEB-INF/src/com/his/zy/service/ZyYzService.java
  4. 4
      release/20241113_1022.text

40
WEB-INF/src/com/his/zy/nursestation/NurseExecuteOrderContainerForm.java
Unescape View File

@ -1,12 +1,13 @@
package com.his.zy.nursestation;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.his.mz.ghmanage.model.MzKsjzModel;
import com.his.mz.service.GzzNPCService;
import com.his.util.DateTimeUtils;
import com.his.zy.nursestation.model.NurseStationBedsModel;
import com.his.zy.nursestation.model.NurseStationHandleModel;
import com.util.MainUtil;
@ -14,6 +15,7 @@ import com.wat.component.DxButtonPanel;
import com.wat.component.DxCheckBox;
import com.wat.component.DxDateTimePick;
import com.wat.component.DxImageList;
import com.wat.component.DxLabel;
import com.wat.component.DxPanelBar;
import com.wat.component.DxPopGridText;
import com.wat.component.DxTreeView;
@ -57,6 +59,7 @@ public class NurseExecuteOrderContainerForm extends WatWebForm {
private WatWebContainerTab container;
private DxButtonPanel buttonPanel1;
private DxButtonPanel buttonPanel2;
private DxLabel dlJsrqInfo;
public NurseExecuteOrderContainerForm() {
@ -653,6 +656,31 @@ public class NurseExecuteOrderContainerForm extends WatWebForm {
// NurseExecuteOrderFormInterface selectForm = (NurseExecuteOrderFormInterface)container.getSelectedForm();
// selectForm.selectOrder(model);
//结束日期超范围提示，不打断
checkJsrq();
}
/**
* 结束日期超范围提示，不打断
*/
private void checkJsrq() {
long lDay = jsrqBetweenToday();
if(lDay > 1l) {
String strMsg = "<font color='red'>注意</font><br>结束日期时间为<font color='blue'> "+lDay+" </font>天后。<br>后续执行时<br><font color='blue'>请再次确认“需执行时间”是否是实际执行时间。</font>";
System.out.println("<<<<护士执行结束日期超范围提示：>>>>"+MainUtil.getCurUserAccount()+" "+strMsg);
dlg.messageDlg(strMsg);
}
}
/**
* 结束日期是否超范围
* @return
*/
private long jsrqBetweenToday() {
Date dJsrq = DateTimeUtils.getDateFromDateStringWithoutTime(DateTimeUtils.getDateStringWithoutTime(new Date(datetimepicker2.getTime())));
Date dToday = DateTimeUtils.getDateFromDateStringWithoutTime(DateTimeUtils.getDateStringWithoutTime(DateTimeUtils.getCurrentDate()));
long lDay = DateTimeUtils.compareDateForMillieconds(dJsrq, dToday) / 86400000l;
return lDay;
}
void setTabHeadShow(String formId,String num) {
@ -738,5 +766,15 @@ public class NurseExecuteOrderContainerForm extends WatWebForm {
popgrid1Action(actionevent.getActionCommand());
}
});
datetimepicker2.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
dlJsrqInfo.setText("");
long lDay = jsrqBetweenToday();
if(lDay>= 1l) {
dlJsrqInfo.setText(lDay+" 天后");
}
}
});
}
}

10
WEB-INF/src/com/his/zy/nursestation/NurseExecuteOrderContainerForm.xml
Unescape View File

@ -36,12 +36,13 @@
<col>
<DxPanelBar id="panelBar4" split="false" size="100,38" tabindex="0" unit="%">
<item align="left" autoExtend="false" >
<DxLabel id="label" size="48,13" title=""/>
<DxLabel id="label" size="10,13" title=""/>
<DxLabel id="label5" size="48,13" title="开始日期"/>
<DxDateTimePick id="datetimepicker1" type="datetime" size="140,28" />
<DxLabel id="label" size="60,13" title=""/>
</item>
<item align="left" autoExtend="false" >
<DxLabel id="label" size="48,13" title=""/>
<DxLabel id="label" size="10,13" title=""/>
<DxButtonPanel id="buttonPanel1" size="230,38" />
</item>
<item align="left" autoExtend="false" >
@ -70,12 +71,13 @@
<col>
<DxPanelBar id="panelBar3" split="false" size="100,38" tabindex="0" unit="%">
<item align="left" autoExtend="false" >
<DxLabel id="label" size="48,13" title=""/>
<DxLabel id="label" size="10,13" title=""/>
<DxLabel id="label13" size="48,13" title="结束日期"/>
<DxDateTimePick id="datetimepicker2" type="datetime" size="140,28" />
<DxLabel id="dlJsrqInfo" size="60,13" color="255,0,0" align="left" title=""/>
</item>
<item align="left" autoExtend="false" >
<DxLabel id="label" size="48,13" title=""/>
<DxLabel id="label" size="10,13" title=""/>
<DxButtonPanel id="buttonPanel2" size="230,38" />
</item>
<item align="left" autoExtend="false" >

14
WEB-INF/src/com/his/zy/service/ZyYzService.java
Unescape View File

@ -4,6 +4,7 @@ import java.sql.Timestamp;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@ -12,7 +13,6 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.his.AL.model.ALModel;
import com.his.AL.service.ALService;
import com.his.kss.model.DmjModel;
@ -28,6 +28,7 @@ import com.his.mz.gzzmanage.model.PatientOrderModel;
import com.his.mz.service.GzzNPCService;
import com.his.mz.service.MzYzService;
import com.his.mz.service.YzzlDpbclService;
import com.his.util.DateTimeUtils;
import com.his.util.GzzFunctionUtil;
import com.his.util.ZyUtil;
import com.his.yfyk.service.YfykNormalParamService;
@ -3698,14 +3699,17 @@ public class ZyYzService {
// return model;
// }
//
if(yzbeginzxsj < jjrq) {
model.setMessage("提示:第"+(i+1)+"行医嘱开始执行时间不能小于患者入院时间，不能审核");
String strJjrq = DateTimeUtils.getDateStringWithoutSecond1(new Date(jjrq));//入院时间 到分 1999-12-31 23:59
String strYzks = DateTimeUtils.getDateStringWithoutSecond1(new Date(yzbeginzxsj));//医嘱开始时间 到分 1999-12-31 23:59
String strYzxz = DateTimeUtils.getDateStringWithoutSecond1(new Date(yzxzsj));//医嘱开始时间 到分 1999-12-31 23:59
if(yzbeginzxsj < jjrq || strJjrq.equals(strYzks)) {
model.setMessage("提示:第"+(i+1)+"行医嘱开始执行时间必须迟于患者入院时间（"+strJjrq+"），不能审核");
model.setResult(-1);
return model;
}
if(yzxzsj < jjrq) {
model.setMessage("提示:第"+(i+1)+"行医嘱下嘱时间不能小于患者入院时间，不能审核");
if(yzxzsj < jjrq || strJjrq.equals(strYzxz)) {
model.setMessage("提示:第"+(i+1)+"行医嘱下嘱时间必须迟于患者入院时间（"+strJjrq+"），不能审核");
model.setResult(-1);
return model;
}

4
release/20241113_1022.text
Unescape View File

@ -94,6 +94,10 @@ develop/lyx_20241120_yzdb
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
develop/xl_20241119_hszxts
医嘱审核：医生下嘱时间、开始时间强制要求迟过入院时间1分钟。
护士执行：结束时间超过今日1天提示、2天弹窗。
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

Write Preview
Loading…
Cancel
Save