Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -1238,18 +1238,6 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                       @RequestParam(value = "cancelValue", required = false) String cancelValue,
                                       @ApiParam(name = "cancelRemark", value = "取消原因详细说明")
                                       @RequestParam(value = "cancelRemark", required = false) String cancelRemark) {
        //修改consult门诊状态
        //修改consult门诊状态
        /*ConsultDo consultDo = consultDao.findByRelationCode(outPatientId);
        if (null!=consultDo){
            ConsultTeamDo consultTeamDo = consultTeamDao.findByConsult(consultDo.getId());
            if (null!=consultTeamDo){
                consultTeamDo.setStatus(-1);
                consultTeamDao.save(consultTeamDo);
            }
        }*/
        try {
            try {
                String consultCode = imService.getConsultCodeByOutpatientId(outPatientId);
@@ -1449,12 +1437,6 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        }
    }
 /*   @PostMapping(value = "test")
    @ApiOperation(value = "test", notes = "test")
    public Envelop test()throws Exception {
        return success(prescriptionService.test());
    }*/
    @PostMapping(value = "test2")
    @ApiOperation(value = "test2", notes = "test2")
    public Envelop test(String no) throws Exception {

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/service/StatisticsService.java

@@ -243,6 +243,7 @@ public class StatisticsService {
        totalMap.put("turnDownNum",turnDownNumTotal);
        totalMap.put("replyRate",getRange(replyNumTotal, inviteNumTotal));
        totalMap.put("list",new ArrayList<>());
        totalMap.put("hasChildren",false);
        List<Map<String,Object>> result = new ArrayList<>();
        result.add(totalMap);
@@ -281,6 +282,10 @@ public class StatisticsService {
            deptTmp.put("replyRate",getRange(replyNumDept, inviteNumDept));
            value.sort(Comparator.comparingInt(a->Integer.parseInt(a.get("replyNum")+"")));
            deptTmp.put("list",value);
            deptTmp.put("hasChildren",false);
            if(value.size()>0){
                deptTmp.put("hasChildren",true);
            }
            result.add(deptTmp);
        }
        List<Map<String,Object>> other = new ArrayList<>();
@@ -329,6 +334,10 @@ public class StatisticsService {
            otherMap.put("replyRate",getRange(replyNumOther, inviteNumOther));
            other.sort(Comparator.comparingInt(a->Integer.parseInt(a.get("replyNum")+"")));
            otherMap.put("list",other);
            otherMap.put("hasChildren",false);
            if(other.size()>0){
                otherMap.put("hasChildren",true);
            }
            result.add(otherMap);
        }