Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -3782,9 +3782,9 @@ public class FamilyContractService extends BaseService {
                " AND f.sick_village IS NOT NULL "+
                " AND f.admin_team_code = ? " ;
        if("2".equals(level)){
            patientSql =  patientSql+" AND s.doctor ='"+oldDoctorCode+"'";
            patientSql =  patientSql+" AND f.doctor ='"+oldDoctorCode+"'";
        }else{
            patientSql =  patientSql+" AND s.doctor_health ='"+oldDoctorCode+"'";
            patientSql =  patientSql+" AND f.doctor_health ='"+oldDoctorCode+"'";
        }
        patientSql = patientSql+" GROUP BY " +
                " f.sick_village " +
@@ -3796,7 +3796,7 @@ public class FamilyContractService extends BaseService {
                String labelCode = (String)map.get("labelCode");
                if(StringUtils.isNotBlank(labelCode)){
                    List<Map<String,String>> codes = new ArrayList<>();
                    Iterator iterator = patientList.iterator();
                    Iterator iterator = totalList.iterator();
                    while(iterator.hasNext()){
                        Map<String,Object> p =  ( Map<String,Object>)iterator.next();
                        String lbCode = p.get("labelCode") ==null?"":((String)p.get("labelCode"));