眼神科技数据统计修改

hnxtba-core/src/main/java/com/founder/khtj/service/impl/IRycjtjServiceImpl.java

@@ -1140,7 +1140,7 @@ private  static Log log = LogFactory.getLog(IRycjtjServiceImpl.class);
                         }
                     }
                     //手机应采数
-                    if (tbRyRycj.size() > 0) {
+                    if (tbRyRycj != null && tbRyRycj.size() > 0) {
                         for (TbRyRycj ryRycj : tbRyRycj) {
                             if (unitCodeBean.getCode().equals(ryRycj.getCode())) {
                                 //手机应采数

hnxtba-core/src/main/resources/mapper/AutoTbXwRycjSqlMap.xml

@@ -467,7 +467,7 @@
         LRDWDM,
         LRR,
         LRSJ,
-        (select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh and (s.sfts = '1' or s.sbcsdm like '%536U') and (xxsc_pdbz ='0' or xxsc_pdbz is null)) as HM,
+        (select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh and (s.sfts = '1' or s.sbcsdm like '%536U' or s.sbcsdm like '%5606') and (xxsc_pdbz ='0' or xxsc_pdbz is null)) as HM,
         (select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh and (s.xzsl ='1'  or s.xzsl is null) and (xxsc_pdbz ='0' or xxsc_pdbz is null)) as ZJ,
         (select count(1) from tb_xw_ythcj_zj s where s.rybh=TB_RY_RYCJ.rybh and (s.SFTS = '0' or s.SFTS is null) and (s.xzsl ='1'  or s.xzsl is null) and (xxsc_pdbz ='0' or xxsc_pdbz is null)) as ZJTS,
         (select count(1) from tb_xw_ythcj_sw s where s.rybh=TB_RY_RYCJ.rybh) as SW,

hnxtba-core/src/main/resources/mapper/KhtjDao.xml

@@ -605,7 +605,7 @@
     (select count(1)
     from tb_xw_ythcj_hm s
     where s.rybh = TB_RY_RYCJ.rybh
-    and (sfts = '1' or sbcsdm like '%536U')) as hm
+    and (sfts = '1' or sbcsdm like '%536U' or sbcsdm like '%5606')) as hm
     from TB_RY_RYCJ
     where (TB_RY_RYCJ.SCBZ = '0' or
     TB_RY_RYCJ.SCBZ is null)
@@ -642,7 +642,7 @@
     (select count(1)
     from tb_xw_ythcj_hm s
     where s.rybh = TB_RY_RYCJ.rybh
-    and (sfts = '1' or sbcsdm like '%536U')) as hm
+    and (sfts = '1' or sbcsdm like '%536U'or sbcsdm like '%5606')) as hm
     from TB_RY_RYCJ
     where (TB_RY_RYCJ.SCBZ = '0' or
     TB_RY_RYCJ.SCBZ is null)
@@ -857,7 +857,7 @@
     LRSJ,
     (select count(*) from tb_ry_ryzp zp where zp.rybh = TB_RY_RYCJ.RYBH) as RXS,
 
-    (select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh and (sfts ='1' or sbcsdm like '%536U')) as HM,
+    (select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh and (sfts ='1' or sbcsdm like '%536U' or sbcsdm like '%5606')) as HM,
     (select count(1) from tb_xw_ythcj_hm s where s.rybh=TB_RY_RYCJ.rybh and (s.SFTS = '1' ) ) as HMTS,
     (select s.SBCSDM from tb_xw_ythcj_hm s where s.rybh =TB_RY_RYCJ.rybh and (s.SFTS = '0' or s.SFTS is null) and ROWNUM =1 )as HMCS,
     (select count(1) from tb_xw_ythcj_sw s where s.rybh=TB_RY_RYCJ.rybh) as SW,

hnxtba-core/src/main/resources/templates/khtj/cxlist.html

@@ -214,7 +214,7 @@
                     if (hmss == '0') {
                         if (hm == null || hm == "" || hm <= 0) {
                             rstStr = "<span  title='虹膜：未采集'><img  src=\"/static/rygl/img/No_red.png\"/></span>";
-                        } else if (hmcs != null && hmcs != '' && hmcs.substring(hmcs.length - 4) == '536U') {
+                        } else if (hmcs != null && hmcs != '' && (hmcs.substring(hmcs.length - 4) == '536U' || hmcs.substring(hmcs.length - 4) == '5606')) {
                             rstStr = "<span  title='虹膜：已采集且推送'><img  src=\"/static/rygl/img/Yes_green.png\"/></span>";
                         } else if (hmcs != null && hmcs != '' && hmcs.substring(hmcs.length - 4) == '2868') {
                             if (hmts >=1 ) {