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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/imm/ChildFamilyImmuneService.java

@@ -76,6 +76,7 @@ public class ChildFamilyImmuneService extends BaseService {
	 */
	public List<Map<String, Object>> getImmunemembers(String repUID) {
		String sql = "select a.*," +
				"b.code as code,"+
				"b.`name` as name," +
				"b.ssc as ssc," +
				"b.idcard as idcard," +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -1096,7 +1096,7 @@ public class JMJkEduArticleService extends BaseService {
    
        page = (page - 1) * pagesize;
    
        String sql = "SELECT * FROM " + esType + "  where patientCode= '" + patientCode + "' and adminTeamCode = '"+teamCode+"' doctorCode='" + uid + "' and userType = 1";
        String sql = "SELECT * FROM " + esType + "  where patientCode= '" + patientCode + "' and adminTeamCode = '"+teamCode+"' and doctorCode='" + uid + "' and userType = 1";
    
        if(!StringUtils.isEmpty(level1Type)){
            sql= sql + " and firstLevelCategoryId = '"+level1Type+"' ";