Merge remote-tracking branch 'origin/master'

lis-module-grp-common-bl/src/main/java/com/sinosoft/lis/sql/pubfun/CalPremBLSQL.java

@@ -18,13 +18,13 @@ public interface CalPremBLSQL {
     String findCalSqlByRiskCodeAndDutyCodeAndPayPlanCode(@Param("tRiskCode")String tRiskCode,@Param("tDutyCode")String tDutyCode,@Param("tPayPlanCode")String tPayPlanCode);
 
     @SQL("select d.calsql from lmriskduty a, lmdutypayrela b, lmdutypay c, lmcalmode d " +
-            " where a.dutycode=b.dutycode and b.payplancode=c.payplancode and CONCAT(c.calcode,'QT')=d.calcode " +
+            " where a.dutycode=b.dutycode and b.payplancode=c.payplancode and c.calcode=d.calcode " +
             " and a.riskcode='"+ "?tRiskCode?" +"' and b.dutycode='"+ "?tDutyCode?" +"'  and a.riskcode not in('231003','231022','231013')")
     String findCalSqlByRiskCodeAndDutyCode1(@Param("tRiskCode")String tRiskCode, @Param("tDutyCode")String tDutyCode);
 
     //!!!G_NB  再保净费暂时没有开发直接调用 QT的算法 后续再改
     @SQL("select d.calsql from lmriskduty a, lmdutypayrela b, lmdutypay c, lmcalmode d " +
-            " where a.dutycode=b.dutycode and b.payplancode=c.payplancode and CONCAT(c.calcode,'ZB')=d.calcode " +
+            " where a.dutycode=b.dutycode and b.payplancode=c.payplancode and c.calcode=d.calcode " +
             " and a.riskcode='"+ "?tRiskCode?" +"' and b.dutycode='"+ "?tDutyCode?" +"' ")
     String findCalSqlByRiskCodeAndDutyCodeZJCBL(@Param("tRiskCode")String tRiskCode, @Param("tDutyCode")String tDutyCode);
 }