-
-
- Q -
- W -
- E -
- R -
- T -
- Y -
- U -
- I -
- O -
- P -
- A -
- S -
- D -
- F -
- G -
- H -
- J -
- K -
- L -
- Z -
- X -
- C -
- V -
- B -
- N -
- M -
+
+
+
+
| ' + var recyclingRecordElement = $(' | ||||||||||||||
| ' +' | '+dateObjFormat(result.data[i].recyclingTime)
+' | '+result.data[i].operator
@@ -650,12 +651,12 @@
}
var awaitForRecycleElement = $(' '+defaultString(departName)
- +' | '+defaultString(dateObjFormat(msg[i].applicationTime))
- +' | '+defaultString(msg[i].applicant)
- +' | '+defaultString(msg[i].type)
- +' | '+defaultString(msg[i].operationRoom)
- +' | '+defaultString(msg[i].remark)+' | '+defaultString(departName)
+ +' | '+defaultString(dateObjFormat(msg[i].applicationTime))
+ +' | '+defaultString(msg[i].applicant)
+ +' | '+defaultString(msg[i].type)
+ +' | '+defaultString(msg[i].operationRoom)
+ +' | '+defaultString(msg[i].remark)+' | |
| 科室 | +科室 | 申请时间 @@ -1117,7 +1136,7 @@ | -手术间 | +手术间 | 备注 |
@@ -112,7 +117,12 @@
}
function addDepart(departCode,departName){
- window.parent.selectDepart(departName,departCode);
+ //待回收列表弹出窗
+ if(isFilterApplication){
+ window.parent.setApplyDepartment(departName,departCode);
+ }else{
+ window.parent.selectDepart(departName,departCode);
+ }
closeLayer();
}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/selectOperationRoom.jsp (revision 17212)
@@ -0,0 +1,151 @@
+
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+选择手术间
+
+
+
+
+
+
+
+
+ getWaitingforRecyclingInvoicePlans(
String handleDepartCoding, String applicationOrgUnitCoding,
- String applicationType, String applyTimeOrder) {
+ String applicationType, String applyTimeOrder,String operationRoom) {
String sql = "where po.committedStatus=true";
String [] recycleStatus = {
@@ -409,7 +409,11 @@
if (StringUtils.isNotBlank(applicationOrgUnitCoding)) {
sql += String.format(" and po.departCoding='%s'", applicationOrgUnitCoding);
}
+ if (StringUtils.isNotBlank(operationRoom)) {
+ sql += String.format(" and po.operationRoom='%s'", operationRoom);
+ }
+
if(StringUtils.isNotBlank(applicationType)){
if(FOREIGNTOUSSE_APP_AWAITRECEIVE.equals(applicationType)){
sql += " and po.type = '" + InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION + "'";
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
===================================================================
diff -u -r17059 -r17212
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java (.../MaintainManager.java) (revision 17059)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java (.../MaintainManager.java) (revision 17212)
@@ -87,4 +87,9 @@
*/
public void foreignTousseApplicationBatchConfirmReturn();
+ /**
+ * 更新申请单手术间字段拼音码五笔码
+ */
+ public void updateOperationRoomSpellingAndWBCode();
+
}
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
===================================================================
diff -u -r17059 -r17212
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 17059)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java (.../MaintainManagerImpl.java) (revision 17212)
@@ -22,6 +22,7 @@
import net.sf.json.JSONObject;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.apache.commons.lang3.ArrayUtils;
@@ -1989,4 +1990,24 @@
}
}
+
+ public void updateOperationRoomSpellingAndWBCode(){
+ String sql = String.format("where po.recyclingStatus in('%s','%s','%s') and po.operationRoom is not null ",
+ InvoicePlan.class.getSimpleName(),InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE,
+ InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE,InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE);
+ @SuppressWarnings("unchecked")
+ List invoicePlanList = objectDao.findBySql(InvoicePlan.class.getSimpleName(), sql);
+ if(CollectionUtils.isNotEmpty(invoicePlanList)){
+ int i = 1;
+ for (InvoicePlan invoicePlan : invoicePlanList) {
+ invoicePlan.setOrSpelling(GB2Alpha.string2Alpha(invoicePlan.getOperationRoom()));
+ invoicePlan.setOrWBCode(GB2WB.getWBCode(invoicePlan.getOperationRoom()));
+ objectDao.saveOrUpdate(invoicePlan);
+ if(i % 50 == 0){
+ objectDao.flush();
+ }
+ i++;
+ }
+ }
+ }
}
+ 
/images/tit_bg_0202.jpg" />
+
+
+
+
+
+
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
===================================================================
diff -u -r17022 -r17212
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 17022)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 17212)
@@ -93,6 +93,17 @@
private String wbCode;// 五笔
+ private String operationRoom;//手术间
+
+ /**
+ * 手术间拼音码
+ */
+ private String orSpelling;
+ /**
+ * 手术间五笔码
+ */
+ private String orWBCode;
+
private Integer readed = UNREAD;
/**
@@ -852,4 +863,29 @@
public void setTousseBarcodes(String tousseBarcodes) {
this.tousseBarcodes = tousseBarcodes;
}
+
+ public String getOrSpelling() {
+ return orSpelling;
+ }
+
+ public void setOrSpelling(String orSpelling) {
+ this.orSpelling = orSpelling;
+ }
+
+ public String getOrWBCode() {
+ return orWBCode;
+ }
+
+ public void setOrWBCode(String orWBCode) {
+ this.orWBCode = orWBCode;
+ }
+
+ public String getOperationRoom() {
+ return operationRoom;
+ }
+
+ public void setOperationRoom(String operationRoom) {
+ this.operationRoom = operationRoom;
+ }
+
}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r17047 -r17212
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 17047)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 17212)
@@ -393,7 +393,7 @@
*/
public List
+
+
+
+
+
+
+
+
+
+
+ | 拼音/五笔 首字母 | ++ | + |