Merge remote-tracking branch 'origin/master'

zhaowenxuan

8 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjSamplingService.java

@@ -89,9 +89,9 @@

    String getBuKeHebingProName(List<String> ids);

    AjaxResult mergeCaiYangTran(List<String> ids);
    AjaxResult mergeCaiYangTran(List<String> ids,String prefix);

    String mergeCaiYangApi(List<String> ids);
    String mergeCaiYangApi(List<String> ids,String prefix);

    /**
     * 判断项目是否能进行合并
@@ -99,4 +99,6 @@
     * @return
     */
    int isMergeItem(String id);

    int isExistProId(String tjh,String proId);
}