Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java

@@ -226,7 +226,7 @@

    @Override
    public Map<String,Object> getCunChuGuoChengCustomerList(String tjNumber, Integer page, Integer pageSize, Integer checkStatus,
                                                          String compId, String beginTime, String endTime, String tjname) {
                                                          String compId, String beginTime, String endTime, String tjname,String tjCategory) {

        Map<String, Object> map = new HashMap<>();
        map.put("checkStatus",checkStatus);
@@ -237,6 +237,7 @@
        map.put("tjname",tjname);
        map.put("beginTime",beginTime);
        map.put("endTime",endTime);
        map.put("p_tjCategory",tjCategory);
        List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map);
        Map<String,Object> map1=new HashMap<>();
        map1.put("customers",list);
@@ -421,6 +422,11 @@
    }

    @Override
    public List<String> getJianChaTjNumWsh() {
        return tjOrderMapper.getJianChaTjNumWsh();
    }

    @Override
    public void tjQiandaodengji(String tjNum) {
        Map<String, Object> map = new HashMap<>();
        map.put("tjNum",tjNum);