Index: ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/InvoicePlanDaoImpl.java
===================================================================
diff -u -r35405 -r35763
--- ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/InvoicePlanDaoImpl.java (.../InvoicePlanDaoImpl.java) (revision 35405)
+++ ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/InvoicePlanDaoImpl.java (.../InvoicePlanDaoImpl.java) (revision 35763)
@@ -67,7 +67,7 @@
String inputXml = WebServiceClientHelper.buildInputString(startDate, endDate);
logger.info("手术排班信息查询服务接口地址:" + WebServiceClientHelper.OPERATION_SCHEDULE_ADDRESS);
logger.info("手术排班查询接口请求信息:" + inputXml);
- //String result = " 0 - 孕1产0孕39+3周头位未临产 850747 3 2023-02-10 02:25:20 9070360057 许宗旭 0000388187 II 2023-02-10 09:00:00 16759289219070360057 无 893846 095148 0000388187 7016 0 2 2 邓海妹 张茹 5071 11 第一台 子宫下段剖宫产术 0 7016 2 7016 择期 2023-02-10 02:25:20
- 肾上腺肿物 185005 3 2023-02-10 06:56:50 9780243783 周益红 0000454866 I 2023-02-13 09:00:00 16759834093780243783 无 893412 185005 0000454866 7016 0 1 1 岑彩虹 185022 9360 31 第二台 腹腔镜下左肾上腺肿物切除术 0 7016 4 7016 择期 2023-02-10 06:56:49
]]> ";
+ //String result = " 0 - 孕1产0孕39+3周头位未临产 850747 3 2023-02-10 02:25:20 9070360057 许宗旭 0000388187 II 2023-02-10 09:00:00 16759289219070360057 无 893846 095148 0000388187 7016 0 1 2 邓海妹 张茹 5071 11 第一台 子宫下段剖宫产术 0 7016 2 7016 择期 2023-02-10 02:25:20
- 肾上腺肿物 185005 3 2023-02-10 06:56:50 9780243783 周益红 0000454866 I 2023-02-13 09:00:00 16759834093780243783 无 893412 185005 0000454866 7016 0 2 1 岑彩虹 185022 9360 31 第二台 腹腔镜下左肾上腺肿物切除术 0 7016 4 7016 择期 2023-02-10 06:56:49
- 孕1产0孕39+3周头位未临产 850747 3 2023-02-10 02:25:20 9070360057 许宗旭 0000388187 II 2023-02-10 09:00:00 16759289219070360057 无 893846 095148 0000388187 7016 0 3 2 邓海妹 张茹 5071 11 第一台 子宫下段剖宫产术 0 7016 2 7016 择期 2023-02-10 02:25:20
- 肾上腺肿物 185005 3 2023-02-10 06:56:50 9780243783 周益红 0000454866 I 2023-02-13 09:00:00 16759834093780243783 无 893412 185005 0000454866 7016 0 4 1 岑彩虹 185022 9360 31 第二台 腹腔镜下左肾上腺肿物切除术 0 7016 4 7016 择期 2023-02-10 06:56:49
]]> ";
String result = WebServiceClientHelper.doPostSoap1_2(WebServiceClientHelper.OPERATION_SCHEDULE_ADDRESS, inputXml);
logger.info("手术排班查询接口返回信息:" + result);
//解析xml获取手术排班信息
@@ -176,6 +176,10 @@
scheduleStatus = HrpInvoicePlan.SCHEDULE_STATUS_FINISH;
}else if(StringUtils.equals(scheduleStatus, WebServiceClientHelper.SCHEDULE_STATUS_SCHEDULED)){
scheduleStatus = HrpInvoicePlan.SCHEDULE_STATUS_SCHEDULED;
+ }else if(StringUtils.equals(scheduleStatus, WebServiceClientHelper.SCHEDULE_STATUS_APPLICATION)){
+ scheduleStatus = HrpInvoicePlan.SCHEDULE_STATUS_APPLICATION;
+ }else if(StringUtils.equals(scheduleStatus, WebServiceClientHelper.SCHEDULE_STATUS_CANCEL)){
+ scheduleStatus = HrpInvoicePlan.SCHEDULE_STATUS_CANCEL;
}
hrpInvoicePlan.setScheduleStatus(scheduleStatus);
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java
===================================================================
diff -u -r35406 -r35763
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java (.../HrpInvoicePlan.java) (revision 35406)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java (.../HrpInvoicePlan.java) (revision 35763)
@@ -109,13 +109,23 @@
private String circuitNurse;
/**
- * 申请状态为“已安排”
+ * 申请状态为“申请”(ZSWY-179)
*/
+ public static final String SCHEDULE_STATUS_APPLICATION = "申请";
+
+ /**
+ * 申请状态为“已安排”(ZSWY-179)
+ */
public static final String SCHEDULE_STATUS_SCHEDULED = "已安排手术";
/**
- * 申请状态为“已完成”
+ * 申请状态为“作废”(ZSWY-179)
*/
+ public static final String SCHEDULE_STATUS_CANCEL = "作废";
+
+ /**
+ * 申请状态为“已完成”(ZSWY-179)
+ */
public static final String SCHEDULE_STATUS_FINISH = "已完成手术";
/**
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java
===================================================================
diff -u -r35405 -r35763
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java (.../OperationReservationAction.java) (revision 35405)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/action/OperationReservationAction.java (.../OperationReservationAction.java) (revision 35763)
@@ -290,8 +290,14 @@
* 数据实时看板新增“今日手术预约信息”(ZSWY-179)
*/
public void findTodayOperationReservatonAmount(){
+ //已安排手术预约信息数量
int scheduledAmount = 0;
+ //已完成手术预约信息数量
int finishedAmount = 0;
+ //已申请手术预约信息数量
+ int applicationAmount = 0;
+ //作废手术预约信息数量
+ int cancelAmount = 0;
JSONObject result = JSONUtil.buildJsonObject(false);
try {
List operationRList = operationReservationManager.findTodayOperationReservaton();
@@ -305,10 +311,20 @@
scheduledAmount++;
continue;
}
+ if(StringUtils.equals(HrpInvoicePlan.SCHEDULE_STATUS_APPLICATION, hrpInvoicePlan.getScheduleStatus())){
+ applicationAmount++;
+ continue;
+ }
+ if(StringUtils.equals(HrpInvoicePlan.SCHEDULE_STATUS_CANCEL, hrpInvoicePlan.getScheduleStatus())){
+ cancelAmount++;
+ continue;
+ }
}
}
result.put("scheduledAmount", scheduledAmount);
result.put("finishedAmount", finishedAmount);
+ result.put("applicationAmount", applicationAmount);
+ result.put("cancelAmount", cancelAmount);
} catch (Exception e) {
result = JSONUtil.buildJsonObject(false, "查询手术排班信息失败:" + e.getMessage());
}
Index: ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/WebServiceClientHelper.java
===================================================================
diff -u -r35405 -r35763
--- ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/WebServiceClientHelper.java (.../WebServiceClientHelper.java) (revision 35405)
+++ ssts-zd5y-misc/src/main/java/com/forgon/disinfectsystem/datasynchronization/zd5y/dao/WebServiceClientHelper.java (.../WebServiceClientHelper.java) (revision 35763)
@@ -57,11 +57,21 @@
public final static String RETURN_CODE_FAIL = "1";
/**
+ * 申请状态为“申请”ZSWY-179
+ */
+ public static final String SCHEDULE_STATUS_APPLICATION = "1";
+
+ /**
* 申请状态为“已安排”ZSWY-179
*/
public static final String SCHEDULE_STATUS_SCHEDULED = "2";
/**
+ * 申请状态为“作废”ZSWY-179
+ */
+ public static final String SCHEDULE_STATUS_CANCEL = "3";
+
+ /**
* 申请状态为“已完成”ZSWY-179
*/
public static final String SCHEDULE_STATUS_FINISH = "4";