diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index 07621b6..11b5e0c 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -36,6 +36,8 @@ public interface CouponMapper { Map findUrl(String code); + List> queryCouponItemsByType(Map params); + void invalid(Map param); String findByUsedId(String usedId); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index a93d4e0..7262d26 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -2,6 +2,7 @@ package com.lyms.platform.permission.service; import com.lyms.platform.common.result.BaseObjectResponse; +import java.util.List; import java.util.Map; import java.util.Set; @@ -33,6 +34,9 @@ public interface CouponService{ String findUrl(String code); + List> queryCouponItemsByType(Map params); + + void invalid(String personId, String couponTypes); String findByUsedId(String usedId); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 1eecfe0..06d1936 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -162,7 +162,7 @@ public class CouponServiceImpl implements CouponService { return CollectionUtils.isNotEmpty(list); } - private void sendCoupon(List> temps, String hospitalId, Integer createUserId, String userId, Integer personType, String areaCode) { + private void sendCoupon(List> temps, String hospitalId, Integer createUserId, String userId, Integer personType) { for (Map temp : temps) { Object sendType = temp.get("send_type"); if(sendType != null) {/** 1=全部发放 2=按有效时间发放 */ @@ -170,7 +170,7 @@ public class CouponServiceImpl implements CouponService { couponInfo.setCreateDate(new Date()); couponInfo.setCreateHospitalId(hospitalId); couponInfo.setCreateUserId(String.valueOf(createUserId)); - couponInfo.setSequenceId(genIdService.poll(areaCode)); + couponInfo.setSequenceId(genIdService.poll()); couponInfo.setStatus(1); couponInfo.setUserId(userId); if(temp.get("coupon_template_id") != null) { @@ -212,6 +212,9 @@ public class CouponServiceImpl implements CouponService { continue; } + + + Object actualStart = temp.get("actual_start"); Object actualEnd = temp.get("actual_end"); Object unitType = temp.get("unit_type"); @@ -404,6 +407,11 @@ public class CouponServiceImpl implements CouponService { return couponMapper.findByUsedId(usedId); } + @Override + public List> queryCouponItemsByType(Map params) { + return couponMapper.queryCouponItemsByType(params); + } + /** 1=省 2=市 3=区 4=单医院 */ private boolean validateArea(String areaType, String createHospitalId, String useHospitald) { Organization createHospital = organizationService.getOrganization(Integer.parseInt(createHospitalId)); diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml index d5f1f98..e10c123 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -124,4 +124,11 @@ select city_id from organization where id = #{hospitalId} + + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index 7a031d8..f22a5e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -32,6 +32,7 @@ public class AreaCountController extends BaseController { * @param provinceId 省份 * @param cityId 城市 * @param areaId 区域 + * @param objType 1,孕妇建档,2,孕妇产检,3,产妇建档,4,产妇分娩,5,产妇出院小结,6,产妇产后复查,7,儿童建档,8,儿童保健 * @return */ @RequestMapping(method = RequestMethod.GET,value = "/getTicketUsedCount") @@ -42,9 +43,10 @@ public class AreaCountController extends BaseController { @RequestParam(required = false)String hospitalId, @RequestParam(required = false)String provinceId, @RequestParam(required = false)String cityId, - @RequestParam(required = false)String areaId) { + @RequestParam(required = false)String areaId, + @RequestParam(required = true)Integer objType) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return areaCountFacade.getTicketUsedCount(time,hospitalId,provinceId,cityId,areaId, loginState.getId()); + return areaCountFacade.getTicketUsedCount(time,hospitalId,provinceId,cityId,areaId, loginState.getId(),objType); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 81ed71c..cc7ed80 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -15,6 +15,7 @@ import com.lyms.platform.operate.web.utils.JdbcUtil; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.DataPermissionsModel; @@ -57,6 +58,9 @@ public class AreaCountFacade { @Autowired private BasicConfigService basicConfigService; + @Autowired + private CouponService couponService; + private static Map node_map = new HashMap<>(); //0:0～12 孕周 1: 16～20 孕周 2: 21～24 孕周 3:28～36 孕周 4:37～ 分娩 //--0～12 孕周,16～20 孕周,21～24 孕周,28～36 孕周,37～ 分娩 @@ -67,32 +71,12 @@ public class AreaCountFacade { node_map.put(3,"28～36 孕周"); node_map.put(4, "37～ 分娩"); - String version = PropertiesUtils.getPropertyValue("his_version"); String area_count_url = PropertiesUtils.getPropertyValue("area_count_url"); - if ("4".equals(version)) - { - //秦皇岛 - DRIVER = "oracle.jdbc.driver.OracleDriver"; - JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl"; - NAME = "LYMS_ODS"; - PWD = "Welcome1"; - } - else if ("6".equals(version)) - { - //德州 - DRIVER = "oracle.jdbc.driver.OracleDriver"; - JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl"; - NAME = "LYMS_ODS"; - PWD = "Welcome1"; - } - else - { - //线上 - DRIVER = "oracle.jdbc.driver.OracleDriver"; - JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl"; - NAME = "LYMS_ODS"; - PWD = "Welcome1"; - } + DRIVER = "oracle.jdbc.driver.OracleDriver"; + JDBC = "jdbc:oracle:thin:@"+area_count_url+":orcl"; + NAME = "LYMS_ODS"; + PWD = "Welcome1"; + } private static String getNodeName(Integer nodeName) @@ -106,337 +90,507 @@ public class AreaCountFacade { public BaseResponse getTicketUsedCount(String time, String hospitalId, String provinceId,String cityId, - String areaId, Integer userId) { - - String sql1 = "SELECT " + - " AAA.PROVINCE," + - " AAA.PROVINCE_ID," + - " AAA.CITY," + - " AAA.CITY_ID," + - " AAA.AREA_COUNTY," + - " AAA.AREA_COUNTY_ID ," + - " AAA.HOSPITAL_NAME," + - " AAA.HOSPITAL_NO," + - " AAA.YCY_STSTEM_ID, " + - " (CASE WHEN FF_RS IS NULL THEN 0 ELSE FF_RS END) AS FF_RS," + - " (CASE WHEN FF_JS IS NULL THEN 0 ELSE FF_JS END) AS FF_JS," + - " (CASE WHEN SY_RS IS NULL THEN 0 ELSE SY_RS END) AS SY_RS," + - " (CASE WHEN SY_JS IS NULL THEN 0 ELSE SY_JS END) AS SY_JS," + - " (CASE WHEN TICKET_1 IS NULL THEN 0 ELSE TICKET_1 END) AS TICKET_1, " + - " (CASE WHEN TICKET_2 IS NULL THEN 0 ELSE TICKET_2 END) AS TICKET_2, " + - " (CASE WHEN TICKET_3 IS NULL THEN 0 ELSE TICKET_3 END) AS TICKET_3, " + - " (CASE WHEN TICKET_4 IS NULL THEN 0 ELSE TICKET_4 END) AS TICKET_4, " + - " (CASE WHEN TICKET_5 IS NULL THEN 0 ELSE TICKET_5 END) AS TICKET_5" + - " FROM ODS_D_HOSPITAL AAA LEFT JOIN (SELECT A.PROVINCE_ID, " + - " A.PROVINCE, " + - " A.CITY_ID, " + - " A.CITY, " + - " A.AREA_COUNTY_ID, " + - " A.AREA_COUNTY, " + - " A.HOSPITAL_NO, " + - " A.HOSPITAL_NAME, " + - " A.YCY_STSTEM_ID, " + - " COUNT(DISTINCT B.RECORD_ID) AS FF_RS, " + - " COUNT(B.TICKETS_NO) AS FF_JS " + - " FROM ODS_D_HOSPITAL A " + - " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" + - " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " + - " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; - String issueSql = ""; - if (StringUtils.isNotEmpty(time)) - { - String start = time.split(" - ")[0]; - String end = time.split(" - ")[1]; - issueSql+=" AND B.ISSUE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd')"; - } - if (StringUtils.isNotEmpty(provinceId)) - { - issueSql += " AND A.PROVINCE_ID= '"+provinceId+"'"; - } - - if (StringUtils.isNotEmpty(cityId)) - { - issueSql+= " AND A.CITY_ID= '" +cityId+"'"; - } + String areaId, Integer userId,Integer type) { + + StringBuilder sql = new StringBuilder(); + sql.append(" select * from ( "); + sql.append(" SELECT A.PROVINCE_ID, A.PROVINCE, A.CITY_ID, "); + sql.append(" A.CITY, A.AREA_COUNTY_ID,"); + sql.append(" A.AREA_COUNTY,A.HOSPITAL_NO,"); + sql.append(" A.HOSPITAL_NAME, A.YCY_STSTEM_ID,"); + sql.append(" BB.OBJ_ID,BB.OBJ_NAME,"); + sql.append(" BB.FF_RS,BB.FF_JS,"); + sql.append(" DD.SY_RS, DD.SY_JS "); + sql.append(" FROM ODS_D_HOSPITAL A LEFT JOIN ( "); + sql.append(" SELECT B.HOSPITAL_NO, C.OBJ_ID, "); + sql.append(" C.OBJ_NAME, COUNT(DISTINCT B.RECORD_ID) AS FF_RS, "); + sql.append(" COUNT(B.TICKETS_NO) AS FF_JS "); + sql.append(" FROM ODS_F_EXAMINE_TICKET B "); + sql.append(" INNER JOIN ODS_F_TICKET_TEMPLATE C ON B.TEMPLATE_ID=C.TEMPLATE_ID "); + sql.append(" INNER JOIN ODS_F_GRAVIDA_RECORD Z ON B.RECORD_ID=Z.RECORD_ID "); + sql.append(" WHERE B.TICKETS_STATUS_ID IN (1,2,3) "); + sql.append(" AND Z.CREATE_TYPE_ID <> 2 "); + sql.append(" AND Z.CREATE_CATEGORY_ID <>2 "); - if (StringUtils.isNotEmpty(areaId)) - { - issueSql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'"; - } - if (StringUtils.isNotEmpty(hospitalId)) - { - issueSql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'"; - } - else - { - String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); - if (StringUtils.isNotEmpty(hospitals)) - { - issueSql+=" AND A.YCY_STSTEM_ID IN " +hospitals; - } + if (StringUtils.isNotEmpty(time)) + { + String start = time.split(" - ")[0]; + String end = time.split(" - ")[1]; + sql.append(" AND B.ISSUE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd') "); + } - } - sql1+=issueSql; - sql1+=" GROUP BY A.PROVINCE_ID, " + - " A.PROVINCE, " + - " A.CITY_ID, " + - " A.CITY, " + - " A.AREA_COUNTY_ID, " + - " A.AREA_COUNTY, " + - " A.HOSPITAL_NO, " + - " A.HOSPITAL_NAME, " + - " A.YCY_STSTEM_ID) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO" + - " LEFT JOIN ( " + - " SELECT A.PROVINCE_ID, " + - " A.PROVINCE, " + - " A.CITY_ID, " + - " A.CITY, " + - " A.AREA_COUNTY_ID, " + - " A.AREA_COUNTY, " + - " A.HOSPITAL_NO, " + - " A.HOSPITAL_NAME, " + - " A.YCY_STSTEM_ID, " + - " COUNT(DISTINCT CC.RECORD_ID) AS SY_RS, " + - " COUNT(CC.TICKETS_NO) AS SY_JS, " + - " SUM((CASE WHEN CC.TICKETS_ORDER=1 THEN 1 END)) AS TICKET_1, " + - " SUM((CASE WHEN CC.TICKETS_ORDER=2 THEN 1 END)) AS TICKET_2, " + - " SUM((CASE WHEN CC.TICKETS_ORDER=3 THEN 1 END)) AS TICKET_3, " + - " SUM((CASE WHEN CC.TICKETS_ORDER=4 THEN 1 END)) AS TICKET_4, " + - " SUM((CASE WHEN CC.TICKETS_ORDER=5 THEN 1 END)) AS TICKET_5 " + - " FROM ODS_F_EXAMINE_HISTORY_ASC CC " + - " LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " + - " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " + - " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; - String examineSql = ""; - if (StringUtils.isNotEmpty(time)) - { - String start = time.split(" - ")[0]; - String end = time.split(" - ")[1]; - examineSql+=" AND CC.EXAMINE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd')"; - } - if (StringUtils.isNotEmpty(provinceId)) - { - examineSql += " AND A.PROVINCE_ID= '"+provinceId+"'"; - } + sql.append(" AND C.OBJ_ID = "+ type); + sql.append(" GROUP BY B.HOSPITAL_NO, C.OBJ_ID, C.OBJ_NAME) "); + sql.append(" BB ON A.HOSPITAL_NO =BB.HOSPITAL_NO LEFT JOIN ( "); + sql.append(" SELECT D.HOSPITAL_NO, E.OBJ_ID, "); + sql.append(" E.OBJ_NAME, COUNT(DISTINCT D.RECORD_ID) AS SY_RS, COUNT(D.TICKETS_NO) AS SY_JS "); + sql.append(" FROM ODS_F_EXAMINE_TICKET D "); + sql.append(" INNER JOIN ODS_F_TICKET_TEMPLATE E ON D.TEMPLATE_ID=E.TEMPLATE_ID "); + sql.append(" INNER JOIN ODS_F_GRAVIDA_RECORD Z ON D.RECORD_ID=Z.RECORD_ID "); + sql.append(" WHERE D.TICKETS_STATUS_ID=2 "); + sql.append(" AND Z.CREATE_TYPE_ID <> 2 "); + sql.append(" AND Z.CREATE_CATEGORY_ID <>2 "); - if (StringUtils.isNotEmpty(cityId)) - { - examineSql+= " AND A.CITY_ID= '" +cityId+"'"; - } + if (StringUtils.isNotEmpty(time)) + { + String start = time.split(" - ")[0]; + String end = time.split(" - ")[1]; + sql.append(" AND D.USE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd') "); + } - if (StringUtils.isNotEmpty(areaId)) - { - examineSql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'"; - } - if (StringUtils.isNotEmpty(hospitalId)) - { - examineSql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'"; - } - else - { - String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); - if (StringUtils.isNotEmpty(hospitals)) - { - examineSql+=" AND A.YCY_STSTEM_ID IN " +hospitals; - } + sql.append(" AND E.OBJ_ID = "+type); + sql.append(" GROUP BY D.HOSPITAL_NO, E.OBJ_ID, E.OBJ_NAME) DD ON A.HOSPITAL_NO =DD.HOSPITAL_NO WHERE 1 = 1"); + if (StringUtils.isNotEmpty(provinceId)) + { + sql.append(" AND A.PROVINCE_ID= '"+provinceId+"' "); + } - } - sql1+=examineSql; - sql1+= " GROUP BY A.PROVINCE_ID, " + - " A.PROVINCE, " + - " A.CITY_ID, " + - " A.CITY, " + - " A.AREA_COUNTY_ID, " + - " A.AREA_COUNTY, " + - " A.HOSPITAL_NO, " + - " A.HOSPITAL_NAME, " + - " A.YCY_STSTEM_ID " + - " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO "; + if (StringUtils.isNotEmpty(cityId)) + { + sql.append(" AND A.CITY_ID= '" +cityId+"' "); + } - sql1+= getTicketSql(time,hospitalId,provinceId,cityId,areaId,userId); + if (StringUtils.isNotEmpty(areaId)) + { + sql.append(" AND A.AREA_COUNTY_ID= '" +areaId+"' "); + } + if (StringUtils.isNotEmpty(hospitalId)) + { + sql.append(" AND A.YCY_STSTEM_ID= '" +hospitalId+"' "); + } + else + { + String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); + if (StringUtils.isNotEmpty(hospitals)) + { + sql.append(" AND A.YCY_STSTEM_ID IN " +hospitals +" "); + } -// if (StringUtils.isNotEmpty(hospitalId)) -// { -// sql1+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'"; -// } -// else -// { -// String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); -// if (StringUtils.isNotEmpty(hospitals)) -// { -// sql1+=" WHERE AAA.YCY_STSTEM_ID IN " +hospitals; -// } -// -// } - sql1+=" ORDER BY 1,2,3"; + } + sql.append(" ) TEMP WHERE "); + sql.append(" (OBJ_ID IS NOT NULL OR OBJ_NAME IS NOT NULL OR FF_RS IS NOT NULL OR FF_JS IS NOT NULL OR SY_RS IS NOT NULL OR SY_JS IS NOT NULL) "); - String groupBySql = ""; - String groupBySql1 = ""; + System.out.println("sql========" + sql.toString()); + List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql.toString()); - if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(areaId)) - { - groupBySql=" AAA.PROVINCE||';'||AAA.PROVINCE_ID AS PROVINCE," + - " AAA.CITY||';'||AAA.CITY_ID AS CITY," + - " AAA.AREA_COUNTY||';'||AAA.AREA_COUNTY_ID AS AREA_COUNTY," + - " AAA.HOSPITAL_NAME||';'||AAA.YCY_STSTEM_ID AS HNAME," ; - groupBySql1="AAA.PROVINCE||';'||AAA.PROVINCE_ID, " + - " AAA.CITY||';'||AAA.CITY_ID, " + - " AAA.AREA_COUNTY||';'||AAA.AREA_COUNTY_ID, " + - " AAA.HOSPITAL_NAME||';'||AAA.YCY_STSTEM_ID"; - } - else if (StringUtils.isNotEmpty(cityId)) - { - groupBySql=" AAA.PROVINCE||';'||AAA.PROVINCE_ID AS PROVINCE," + - " AAA.CITY||';'||AAA.CITY_ID AS CITY," + - " AAA.AREA_COUNTY||';'||AAA.AREA_COUNTY_ID AS AREA_COUNTY," ; - groupBySql1=" AAA.PROVINCE||';'||AAA.PROVINCE_ID, " + - " AAA.CITY||';'||AAA.CITY_ID, " + - " AAA.AREA_COUNTY||';'||AAA.AREA_COUNTY_ID"; - } - else if (StringUtils.isNotEmpty(provinceId)) - { - groupBySql=" AAA.PROVINCE||';'||AAA.PROVINCE_ID AS PROVINCE," + - " AAA.CITY||';'||AAA.CITY_ID AS CITY,"; - groupBySql1="AAA.PROVINCE||';'||AAA.PROVINCE_ID, " + - " AAA.CITY||';'||AAA.CITY_ID "; - } - else - { - groupBySql=" AAA.PROVINCE||';'||AAA.PROVINCE_ID AS PROVINCE,"; - groupBySql1="AAA.PROVINCE||';'||AAA.PROVINCE_ID"; - } - String countSql = "SELECT "+groupBySql+ - " SUM(AA.FF_JS) AS FF_JS,\n" + - " SUM(SY_JS) AS SY_JS\n" + - " FROM ODS_D_HOSPITAL AAA \n" + - " LEFT JOIN (\n" + - " SELECT A.PROVINCE_ID,\n" + - " A.PROVINCE,\n" + - " A.CITY_ID,\n" + - " A.CITY,\n" + - " A.AREA_COUNTY_ID,\n" + - " A.AREA_COUNTY,\n" + - " A.HOSPITAL_NO,\n" + - " A.HOSPITAL_NAME,\n" + - " A.YCY_STSTEM_ID,\n" + - " COUNT(DISTINCT B.RECORD_ID) AS FF_RS,\n" + - " COUNT(B.TICKETS_NO) AS FF_JS\n" + - " FROM ODS_D_HOSPITAL A\n" + - " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO " + - " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " + - " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ; - countSql+=issueSql; - countSql+=" GROUP BY A.PROVINCE_ID,\n" + - " A.PROVINCE,\n" + - " A.CITY_ID,\n" + - " A.CITY,\n" + - " A.AREA_COUNTY_ID,\n" + - " A.AREA_COUNTY,\n" + - " A.HOSPITAL_NO,\n" + - " A.HOSPITAL_NAME,\n" + - " A.YCY_STSTEM_ID) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO\n" + - " LEFT JOIN (\n" + - " SELECT A.PROVINCE_ID,\n" + - " A.PROVINCE,\n" + - " A.CITY_ID,\n" + - " A.CITY,\n" + - " A.AREA_COUNTY_ID,\n" + - " A.AREA_COUNTY,\n" + - " A.HOSPITAL_NO,\n" + - " A.HOSPITAL_NAME,\n" + - " A.YCY_STSTEM_ID,\n" + - " COUNT(DISTINCT CC.RECORD_ID) AS SY_RS,\n" + - " COUNT(CC.TICKETS_NO) AS SY_JS\n" + - " FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" + - " LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID" + - " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 " ; - countSql+=examineSql; - countSql+=" GROUP BY A.PROVINCE_ID,\n" + - " A.PROVINCE,\n" + - " A.CITY_ID,\n" + - " A.CITY,\n" + - " A.AREA_COUNTY_ID,\n" + - " A.AREA_COUNTY,\n" + - " A.HOSPITAL_NO,\n" + - " A.HOSPITAL_NAME,\n" + - " A.YCY_STSTEM_ID\n" + - " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO " ; + StringBuilder itemSql = new StringBuilder(); + itemSql.append(" SELECT D.HOSPITAL_NO, E.OBJ_ID, "); + itemSql.append(" E.OBJ_NAME, D.TICKETS_ORDER, "); + itemSql.append(" E.TEMPLATE_NAME, COUNT(D.TICKETS_NO) AS SY_RC "); + itemSql.append(" FROM ODS_D_HOSPITAL A "); + itemSql.append(" LEFT JOIN ODS_F_EXAMINE_TICKET D ON A.HOSPITAL_NO =D.HOSPITAL_NO "); + itemSql.append(" INNER JOIN ODS_F_TICKET_TEMPLATE E ON D.TEMPLATE_ID=E.TEMPLATE_ID "); + itemSql.append(" INNER JOIN ODS_F_GRAVIDA_RECORD Z ON D.RECORD_ID=Z.RECORD_ID "); + itemSql.append(" WHERE D.TICKETS_STATUS_ID=2 "); + itemSql.append(" AND Z.CREATE_TYPE_ID <> 2 "); + itemSql.append(" AND Z.CREATE_CATEGORY_ID <>2 "); - countSql+= getTicketSql(time,hospitalId,provinceId,cityId,areaId,userId); + if (StringUtils.isNotEmpty(time)) + { + String start = time.split(" - ")[0]; + String end = time.split(" - ")[1]; + sql.append(" AND D.USE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd') "); + } + itemSql.append(" AND E.OBJ_ID= "+type); + itemSql.append(" AND A.YCY_STSTEM_ID='"+hospitalId+"'"); + itemSql.append(" GROUP BY D.HOSPITAL_NO, E.OBJ_ID, "); + itemSql.append(" E.OBJ_NAME, D.TICKETS_ORDER, E.TEMPLATE_NAME "); + itemSql.append(" order by D.TICKETS_ORDER ASC "); -// if (StringUtils.isNotEmpty(hospitalId)) -// { -// countSql+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'"; -// } -// else -// { -// String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); -// if (StringUtils.isNotEmpty(hospitals)) -// { -// countSql+=" WHERE AAA.YCY_STSTEM_ID IN " +hospitals; -// } -// -// } - countSql+=" GROUP BY ROLLUP("+groupBySql1+") ORDER BY 1,2,3"; - System.out.println("basesql===="+sql1); - System.out.println("countSql====" + countSql); - //产检使用图形统计 + // //产检使用图形统计 List chartData = new ArrayList<>(); List ffJsData = new ArrayList<>(); List syJsData = new ArrayList<>(); - List> ticketCount = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, countSql); - if (CollectionUtils.isNotEmpty(ticketCount)) - { - for(Map map : ticketCount) - { + List> ticketItemList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, itemSql.toString()); - if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(areaId)) - { - if (map.get("HNAME") == null) - { - continue; - } - chartData.add(spitValue(map.get("HNAME"))); - } - else if (StringUtils.isNotEmpty(cityId)) - { - if (map.get("AREA_COUNTY") == null) - { - continue; - } - chartData.add(spitValue(map.get("AREA_COUNTY"))); - } - else if (StringUtils.isNotEmpty(provinceId)) - { - if (map.get("CITY") == null) - { - continue; - } - chartData.add(spitValue(map.get("CITY"))); - } - else + Map params = new HashMap<>(); + params.put("hospitalId", hospitalId); + params.put("type", type); + List> items = couponService.queryCouponItemsByType(params); + if (CollectionUtils.isNotEmpty(items)) { + for (int i = 0; i < items.size(); i++) { + items.get(i).put("key", "USE_NUM" + (i + 1)); + } + } + + + if (CollectionUtils.isNotEmpty(ticketList)) + { + for(Map map : ticketList) + { + chartData.add(map.get("HOSPITAL_NAME").toString()); + ffJsData.add(map.get("FF_JS") == null ? 0 : Integer.parseInt(map.get("FF_JS").toString())); + syJsData.add(map.get("SY_JS") == null ? 0 : Integer.parseInt(map.get("SY_JS").toString())); + if (CollectionUtils.isNotEmpty(items)) + { + for(int i = 0 ; i < items.size() ; i++) + { + Map item = items.get(i); + String name = item.get("name").toString(); + Integer num = 0; + if (CollectionUtils.isNotEmpty(ticketItemList)) + { + for(Map itemMap : ticketItemList) { - if (map.get("PROVINCE") == null) + String ticketName = itemMap.get("TEMPLATE_NAME").toString(); + if (StringUtils.isNotEmpty(name) && name.equals(ticketName)) { - continue; + num = itemMap.get("SY_RC") == null ? 0 : Integer.parseInt(itemMap.get("SY_RC").toString()); + break; } - chartData.add(spitValue(map.get("PROVINCE"))); } - ffJsData.add(getInteger(map.get("FF_JS"))); - syJsData.add(getInteger(map.get("SY_JS"))); + } + map.put("USE_NUM"+(i+1),num); } + } } + } + + + + +// String sql1 = "SELECT " + +// " AAA.PROVINCE," + +// " AAA.PROVINCE_ID," + +// " AAA.CITY," + +// " AAA.CITY_ID," + +// " AAA.AREA_COUNTY," + +// " AAA.AREA_COUNTY_ID ," + +// " AAA.HOSPITAL_NAME," + +// " AAA.HOSPITAL_NO," + +// " AAA.YCY_STSTEM_ID, " + +// " (CASE WHEN FF_RS IS NULL THEN 0 ELSE FF_RS END) AS FF_RS," + +// " (CASE WHEN FF_JS IS NULL THEN 0 ELSE FF_JS END) AS FF_JS," + +// " (CASE WHEN SY_RS IS NULL THEN 0 ELSE SY_RS END) AS SY_RS," + +// " (CASE WHEN SY_JS IS NULL THEN 0 ELSE SY_JS END) AS SY_JS," + +// " (CASE WHEN TICKET_1 IS NULL THEN 0 ELSE TICKET_1 END) AS TICKET_1, " + +// " (CASE WHEN TICKET_2 IS NULL THEN 0 ELSE TICKET_2 END) AS TICKET_2, " + +// " (CASE WHEN TICKET_3 IS NULL THEN 0 ELSE TICKET_3 END) AS TICKET_3, " + +// " (CASE WHEN TICKET_4 IS NULL THEN 0 ELSE TICKET_4 END) AS TICKET_4, " + +// " (CASE WHEN TICKET_5 IS NULL THEN 0 ELSE TICKET_5 END) AS TICKET_5" + +// " FROM ODS_D_HOSPITAL AAA LEFT JOIN (SELECT A.PROVINCE_ID, " + +// " A.PROVINCE, " + +// " A.CITY_ID, " + +// " A.CITY, " + +// " A.AREA_COUNTY_ID, " + +// " A.AREA_COUNTY, " + +// " A.HOSPITAL_NO, " + +// " A.HOSPITAL_NAME, " + +// " A.YCY_STSTEM_ID, " + +// " COUNT(DISTINCT B.RECORD_ID) AS FF_RS, " + +// " COUNT(B.TICKETS_NO) AS FF_JS " + +// " FROM ODS_D_HOSPITAL A " + +// " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO" + +// " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " + +// " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 "; +// String issueSql = ""; +// if (StringUtils.isNotEmpty(time)) +// { +// String start = time.split(" - ")[0]; +// String end = time.split(" - ")[1]; +// issueSql+=" AND B.ISSUE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd')"; +// } +// if (StringUtils.isNotEmpty(provinceId)) +// { +// issueSql += " AND A.PROVINCE_ID= '"+provinceId+"'"; +// } +// +// if (StringUtils.isNotEmpty(cityId)) +// { +// issueSql+= " AND A.CITY_ID= '" +cityId+"'"; +// } +// +// if (StringUtils.isNotEmpty(areaId)) +// { +// issueSql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'"; +// } +// if (StringUtils.isNotEmpty(hospitalId)) +// { +// issueSql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'"; +// } +// else +// { +// String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); +// if (StringUtils.isNotEmpty(hospitals)) +// { +// issueSql+=" AND A.YCY_STSTEM_ID IN " +hospitals; +// } +// +// } +// sql1+=issueSql; +// sql1+=" GROUP BY A.PROVINCE_ID, " + +// " A.PROVINCE, " + +// " A.CITY_ID, " + +// " A.CITY, " + +// " A.AREA_COUNTY_ID, " + +// " A.AREA_COUNTY, " + +// " A.HOSPITAL_NO, " + +// " A.HOSPITAL_NAME, " + +// " A.YCY_STSTEM_ID) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO" + +// " LEFT JOIN ( " + +// " SELECT A.PROVINCE_ID, " + +// " A.PROVINCE, " + +// " A.CITY_ID, " + +// " A.CITY, " + +// " A.AREA_COUNTY_ID, " + +// " A.AREA_COUNTY, " + +// " A.HOSPITAL_NO, " + +// " A.HOSPITAL_NAME, " + +// " A.YCY_STSTEM_ID, " + +// " COUNT(DISTINCT CC.RECORD_ID) AS SY_RS, " + +// " COUNT(CC.TICKETS_NO) AS SY_JS, " + +// " SUM((CASE WHEN CC.TICKETS_ORDER=1 THEN 1 END)) AS TICKET_1, " + +// " SUM((CASE WHEN CC.TICKETS_ORDER=2 THEN 1 END)) AS TICKET_2, " + +// " SUM((CASE WHEN CC.TICKETS_ORDER=3 THEN 1 END)) AS TICKET_3, " + +// " SUM((CASE WHEN CC.TICKETS_ORDER=4 THEN 1 END)) AS TICKET_4, " + +// " SUM((CASE WHEN CC.TICKETS_ORDER=5 THEN 1 END)) AS TICKET_5 " + +// " FROM ODS_F_EXAMINE_HISTORY_ASC CC " + +// " LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO " + +// " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " + +// " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 "; +// String examineSql = ""; +// if (StringUtils.isNotEmpty(time)) +// { +// String start = time.split(" - ")[0]; +// String end = time.split(" - ")[1]; +// examineSql+=" AND CC.EXAMINE_DATE BETWEEN TO_DATE('"+start+"','yyyy-mm-dd') AND TO_DATE('"+end+"','yyyy-mm-dd')"; +// } +// if (StringUtils.isNotEmpty(provinceId)) +// { +// examineSql += " AND A.PROVINCE_ID= '"+provinceId+"'"; +// } +// +// if (StringUtils.isNotEmpty(cityId)) +// { +// examineSql+= " AND A.CITY_ID= '" +cityId+"'"; +// } +// +// if (StringUtils.isNotEmpty(areaId)) +// { +// examineSql+= " AND A.AREA_COUNTY_ID= '" +areaId+"'"; +// } +// if (StringUtils.isNotEmpty(hospitalId)) +// { +// examineSql+=" AND A.YCY_STSTEM_ID= '" +hospitalId+"'"; +// } +// else +// { +// String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); +// if (StringUtils.isNotEmpty(hospitals)) +// { +// examineSql+=" AND A.YCY_STSTEM_ID IN " +hospitals; +// } +// +// } +// sql1+=examineSql; +// sql1+= " GROUP BY A.PROVINCE_ID, " + +// " A.PROVINCE, " + +// " A.CITY_ID, " + +// " A.CITY, " + +// " A.AREA_COUNTY_ID, " + +// " A.AREA_COUNTY, " + +// " A.HOSPITAL_NO, " + +// " A.HOSPITAL_NAME, " + +// " A.YCY_STSTEM_ID " + +// " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO "; +// +// sql1+= getTicketSql(time,hospitalId,provinceId,cityId,areaId,userId); +// +//// if (StringUtils.isNotEmpty(hospitalId)) +//// { +//// sql1+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'"; +//// } +//// else +//// { +//// String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); +//// if (StringUtils.isNotEmpty(hospitals)) +//// { +//// sql1+=" WHERE AAA.YCY_STSTEM_ID IN " +hospitals; +//// } +//// +//// } +// sql1+=" ORDER BY 1,2,3"; +// +// String groupBySql = ""; +// String groupBySql1 = ""; +// +// if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(areaId)) +// { +// groupBySql=" AAA.PROVINCE||';'||AAA.PROVINCE_ID AS PROVINCE," + +// " AAA.CITY||';'||AAA.CITY_ID AS CITY," + +// " AAA.AREA_COUNTY||';'||AAA.AREA_COUNTY_ID AS AREA_COUNTY," + +// " AAA.HOSPITAL_NAME||';'||AAA.YCY_STSTEM_ID AS HNAME," ; +// groupBySql1="AAA.PROVINCE||';'||AAA.PROVINCE_ID, " + +// " AAA.CITY||';'||AAA.CITY_ID, " + +// " AAA.AREA_COUNTY||';'||AAA.AREA_COUNTY_ID, " + +// " AAA.HOSPITAL_NAME||';'||AAA.YCY_STSTEM_ID"; +// } +// +// else if (StringUtils.isNotEmpty(cityId)) +// { +// groupBySql=" AAA.PROVINCE||';'||AAA.PROVINCE_ID AS PROVINCE," + +// " AAA.CITY||';'||AAA.CITY_ID AS CITY," + +// " AAA.AREA_COUNTY||';'||AAA.AREA_COUNTY_ID AS AREA_COUNTY," ; +// groupBySql1=" AAA.PROVINCE||';'||AAA.PROVINCE_ID, " + +// " AAA.CITY||';'||AAA.CITY_ID, " + +// " AAA.AREA_COUNTY||';'||AAA.AREA_COUNTY_ID"; +// } +// else if (StringUtils.isNotEmpty(provinceId)) +// { +// groupBySql=" AAA.PROVINCE||';'||AAA.PROVINCE_ID AS PROVINCE," + +// " AAA.CITY||';'||AAA.CITY_ID AS CITY,"; +// groupBySql1="AAA.PROVINCE||';'||AAA.PROVINCE_ID, " + +// " AAA.CITY||';'||AAA.CITY_ID "; +// } +// else +// { +// groupBySql=" AAA.PROVINCE||';'||AAA.PROVINCE_ID AS PROVINCE,"; +// groupBySql1="AAA.PROVINCE||';'||AAA.PROVINCE_ID"; +// } +// +// +// String countSql = "SELECT "+groupBySql+ +// " SUM(AA.FF_JS) AS FF_JS,\n" + +// " SUM(SY_JS) AS SY_JS\n" + +// " FROM ODS_D_HOSPITAL AAA \n" + +// " LEFT JOIN (\n" + +// " SELECT A.PROVINCE_ID,\n" + +// " A.PROVINCE,\n" + +// " A.CITY_ID,\n" + +// " A.CITY,\n" + +// " A.AREA_COUNTY_ID,\n" + +// " A.AREA_COUNTY,\n" + +// " A.HOSPITAL_NO,\n" + +// " A.HOSPITAL_NAME,\n" + +// " A.YCY_STSTEM_ID,\n" + +// " COUNT(DISTINCT B.RECORD_ID) AS FF_RS,\n" + +// " COUNT(B.TICKETS_NO) AS FF_JS\n" + +// " FROM ODS_D_HOSPITAL A\n" + +// " LEFT JOIN ODS_F_EXAMINE_TICKET B ON A.HOSPITAL_NO=B.HOSPITAL_NO " + +// " INNER JOIN ODS_F_GRAVIDA_RECORD C ON B.RECORD_ID=C.RECORD_ID " + +// " WHERE 1=1 AND C.CREATE_TYPE_ID <> 2 AND C.CREATE_CATEGORY_ID <> 2 " ; +// countSql+=issueSql; +// countSql+=" GROUP BY A.PROVINCE_ID,\n" + +// " A.PROVINCE,\n" + +// " A.CITY_ID,\n" + +// " A.CITY,\n" + +// " A.AREA_COUNTY_ID,\n" + +// " A.AREA_COUNTY,\n" + +// " A.HOSPITAL_NO,\n" + +// " A.HOSPITAL_NAME,\n" + +// " A.YCY_STSTEM_ID) AA ON AAA.HOSPITAL_NO=AA.HOSPITAL_NO\n" + +// " LEFT JOIN (\n" + +// " SELECT A.PROVINCE_ID,\n" + +// " A.PROVINCE,\n" + +// " A.CITY_ID,\n" + +// " A.CITY,\n" + +// " A.AREA_COUNTY_ID,\n" + +// " A.AREA_COUNTY,\n" + +// " A.HOSPITAL_NO,\n" + +// " A.HOSPITAL_NAME,\n" + +// " A.YCY_STSTEM_ID,\n" + +// " COUNT(DISTINCT CC.RECORD_ID) AS SY_RS,\n" + +// " COUNT(CC.TICKETS_NO) AS SY_JS\n" + +// " FROM ODS_F_EXAMINE_HISTORY_ASC CC\n" + +// " LEFT JOIN ODS_D_HOSPITAL A ON A.HOSPITAL_NO=CC.HOSPITAL_NO INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID" + +// " WHERE CC.TICKETS_NO IS NOT NULL AND B.CREATE_TYPE_ID <> 2 AND B.CREATE_CATEGORY_ID <> 2 " ; +// countSql+=examineSql; +// countSql+=" GROUP BY A.PROVINCE_ID,\n" + +// " A.PROVINCE,\n" + +// " A.CITY_ID,\n" + +// " A.CITY,\n" + +// " A.AREA_COUNTY_ID,\n" + +// " A.AREA_COUNTY,\n" + +// " A.HOSPITAL_NO,\n" + +// " A.HOSPITAL_NAME,\n" + +// " A.YCY_STSTEM_ID\n" + +// " ) BB ON AAA.HOSPITAL_NO=BB.HOSPITAL_NO " ; +// +// countSql+= getTicketSql(time,hospitalId,provinceId,cityId,areaId,userId); +// +//// if (StringUtils.isNotEmpty(hospitalId)) +//// { +//// countSql+=" WHERE AAA.YCY_STSTEM_ID= '" +hospitalId+"'"; +//// } +//// else +//// { +//// String hospitals = getPermissionStr(userId,provinceId,cityId,areaId); +//// if (StringUtils.isNotEmpty(hospitals)) +//// { +//// countSql+=" WHERE AAA.YCY_STSTEM_ID IN " +hospitals; +//// } +//// +//// } +// countSql+=" GROUP BY ROLLUP("+groupBySql1+") ORDER BY 1,2,3"; +// +// System.out.println("basesql===="+sql1); +// System.out.println("countSql====" + countSql); +// +// //产检使用图形统计 +// List chartData = new ArrayList<>(); +// List ffJsData = new ArrayList<>(); +// List syJsData = new ArrayList<>(); +// List> ticketCount = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, countSql); +// if (CollectionUtils.isNotEmpty(ticketCount)) +// { +// +// for(Map map : ticketCount) +// { +// +// if (StringUtils.isNotEmpty(hospitalId) || StringUtils.isNotEmpty(areaId)) +// { +// if (map.get("HNAME") == null) +// { +// continue; +// } +// chartData.add(spitValue(map.get("HNAME"))); +// } +// else if (StringUtils.isNotEmpty(cityId)) +// { +// if (map.get("AREA_COUNTY") == null) +// { +// continue; +// } +// chartData.add(spitValue(map.get("AREA_COUNTY"))); +// } +// else if (StringUtils.isNotEmpty(provinceId)) +// { +// if (map.get("CITY") == null) +// { +// continue; +// } +// chartData.add(spitValue(map.get("CITY"))); +// } +// else +// { +// if (map.get("PROVINCE") == null) +// { +// continue; +// } +// chartData.add(spitValue(map.get("PROVINCE"))); +// } +// ffJsData.add(getInteger(map.get("FF_JS"))); +// syJsData.add(getInteger(map.get("SY_JS"))); +// } +// } +// +// //产检使用表格统计 +// List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql1); +// Map data = new HashMap<>(); +// data.put("list",ticketList); +// data.put("chartData",chartData); +// data.put("ffJsData",ffJsData); +// data.put("syJsData",syJsData); - //产检使用表格统计 - List> ticketList = JdbcUtil.getOracleListDataBySql(DRIVER, JDBC, NAME, PWD, sql1); Map data = new HashMap<>(); - data.put("list",ticketList); + data.put("ticketList",ticketList); + data.put("TITLES",items); data.put("chartData",chartData); data.put("ffJsData",ffJsData); data.put("syJsData",syJsData);