Browse Source

续方咨询,随访相关接口BUG修改

huangwenjie 7 years ago
parent
commit
4189eeebf4

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

@ -67,7 +67,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				String followupProject = jsonObject.getString("followupProject");
				String projectValueStr = jsonObject.getString("projectData");
				if(StringUtils.isNotBlank(projectValueStr)){
					HashMap<String,String> projectValueMap = (HashMap)JSON.parse(projectValueStr);
					Map<String,String> projectValueMap = (Map)JSON.parse(projectValueStr);
					if(!projectValueMap.isEmpty()){
						projectValueMap.forEach( (key,value)->{
							PrescriptionFollowupContent prescriptionFollowupContent = new PrescriptionFollowupContent();
@ -136,7 +136,7 @@ public class PrescriptionFollowupContentService extends BaseService {
			JSONObject jsonObject1 = new JSONObject();
			jsonObject1.put("type","1");
			jsonObject1.put("name","身份异常症状问卷");
			jsonObject1.put("statue","已填写");
			jsonObject1.put("statue","1");//1已填写,2未填写
			jsonObject1.put("createtime",prescriptionFollowupContent1.getCreateTime());
			result.add(jsonObject1);
		}
@ -145,7 +145,7 @@ public class PrescriptionFollowupContentService extends BaseService {
			JSONObject jsonObject2 = new JSONObject();
			jsonObject2.put("type","2");
			jsonObject2.put("name","体征及生活方式调查问卷");
			jsonObject2.put("statue","已填写");
			jsonObject2.put("statue","1");//1已填写,2未填写
			jsonObject2.put("createtime",prescriptionFollowupContent1.getCreateTime());
			result.add(jsonObject2);
		}

+ 1 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/DoctorPrescriptionFollowupContentController.java

@ -68,7 +68,7 @@ public class DoctorPrescriptionFollowupContentController extends BaseController
			@RequestParam(value = "prescriptioncode", required = true) String prescriptioncode){
		try {
			JSONArray result = prescriptionFollowupContentService.getList(prescriptioncode);
			return write(200, "请求成功!");
			return write(200, "请求成功!","data",result);
		}catch (Exception e){
			//日志文件中记录异常信息
			error(e);

+ 2 - 2
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/PatientHealthController.java

@ -471,11 +471,11 @@ public class PatientHealthController extends BaseController {
            JSONArray jsonArray = new JSONArray();
            if (type == 1) {
                List<Object> list = healthIndexService.findIndexByPatient2(getRepUID(), type, start, end, page, pagesize);
//                List<Object> list = healthIndexService.findIndexByPatient2(getUID(), type, start, end, page, pagesize);
//                List<Object> list = healthIndexService.findIndexByPatient2("ec7572875d27446cb4f067b13a85d72a", type, start, end, page, pagesize);
                jsonArray = new JSONArray(list);
            } else {
                jsonArray = healthIndexService.findIndexByPatient(getRepUID(), type, start, end, page, pagesize);
//                List<DevicePatientHealthIndex> list = healthIndexService.findIndexByPatient(getUID(), type, start, end, page, pagesize);
//                List<DevicePatientHealthIndex> list = healthIndexService.findIndexByPatient("ec7572875d27446cb4f067b13a85d72a", type, start, end, page, pagesize);
            }