Merge remote-tracking branch 'origin/matser' into matser

ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/office/provider/BpmInitiatedProvider.java

@@ -9,6 +9,7 @@ import java.util.function.Function;
 
 import javax.annotation.Resource;
 
+import com.alibaba.fastjson.JSONObject;
 import com.lc.ibps.base.core.util.Collections;
 import com.lc.ibps.base.framework.table.ICommonDao;
 import com.lc.ibps.bpmn.service.impl.BpmProcInstServiceImpl;
@@ -1548,6 +1549,17 @@ public class BpmInitiatedProvider extends GenericProvider implements IBpmInitiat
 									"	WHERE di_dian_=#{p0} AND DATE(create_time_)=CURDATE() AND shi_fou_guo_shen_='待处理'", new String[]{(String)object3.get(0).get("id_")});
 					infobox2.setDataText(object4.get(0).get("total").toString());
 				}
+				//恒生医院专用配置-对应任务4792的改造同步 可推送人为空的全部推送，不为空则推送指定的推送人
+				if(BeanUtils.isNotEmpty(ContextUtil.getSetting())){
+					JSONObject configMap = JSONObject.parseObject(ContextUtil.getSetting());
+					String HSYY = configMap.getString("HSYY");
+					if(BeanUtils.isNotEmpty(HSYY) && HSYY.equals("true")){
+						String sql =" SELECT count(*) as count FROM t_mjsbwhbyjlby WHERE DATE(create_time_) = CURDATE()  AND shi_fou_guo_shen_ = '待处理' " +
+								"  AND (ke_tui_song_ren_ IS NULL OR ke_tui_song_ren_ = '' OR ke_tui_song_ren_ LIKE '%"+currentUserId+"%')";
+						Map<String, Object> mjsbwhbyjlbyMap = commonDao.queryOne(sql);
+						infobox2.setDataText(getStringFromMap(mjsbwhbyjlbyMap,"count"));
+					}
+				}
 				list.add(infobox2);
 			} catch (Exception e) {
 				logger.error(e.getMessage(), e);
@@ -1819,6 +1831,17 @@ public class BpmInitiatedProvider extends GenericProvider implements IBpmInitiat
 		}
 		return result;
 	}
-	
+	public static String getStringFromMap(Map<String, Object> map, String key) {
+		if (map == null || key == null) {
+			return "";
+		}
+
+		Object value = map.get(key);
+		if (value == null) {
+			return "";
+		}
+
+		return value.toString();
+	}
 	
 }