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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionFollowupContentService.java

@@ -299,7 +299,7 @@ public class PrescriptionFollowupContentService extends BaseService {
		Date imBloodSugarDate = new Date();
		
		int total = 0;
		String sql = "SELECT count(id) amount FROM wlyy_patient_device where  user='"+prescription.getPatient()+"' AND category_code = 2";
		String sql = "SELECT count(id) amount FROM wlyy_patient_device where  user='"+prescription.getPatient()+"' AND category_code = 1";
		List<Map<String,Object>> result =  jdbcTemplate.queryForList(sql);
		if (result != null && result.size() > 0) {
			if(result.get(0).get("amount") != null){
@@ -489,7 +489,7 @@ public class PrescriptionFollowupContentService extends BaseService {
		org.json.JSONObject contentPatient = new org.json.JSONObject();
		
		int total = 0;
		String sql = "SELECT count(id) amount FROM wlyy_patient_device where  user='"+prescription.getPatient()+"' AND category_code = 1";
		String sql = "SELECT count(id) amount FROM wlyy_patient_device where  user='"+prescription.getPatient()+"' AND category_code = 2";
		List<Map<String,Object>> result =  jdbcTemplate.queryForList(sql);
		if (result != null && result.size() > 0) {
			if(result.get(0).get("amount") != null){