|
@@ -111,7 +111,7 @@ public class RestApiController {
|
|
|
|
|
|
String resourceType = dto.getResourceType();
|
|
|
if (resourceType.equals("")) {
|
|
|
- object.put("error", "invalidParameters");
|
|
|
+ object.put("error", "emptyResourceType");
|
|
|
return object.toString();
|
|
|
} else {
|
|
|
if (resourceType.equals("bloodPressure") || resourceType.equals("bloodSugar") ||
|
|
@@ -119,6 +119,8 @@ public class RestApiController {
|
|
|
|
|
|
result = selectPhrData(dto);
|
|
|
|
|
|
+ } else if (resourceType.equals("clinicMemo")) {
|
|
|
+ result = selectClinicMemoList(dto);
|
|
|
} else if (resourceType.equals("patientInfoList")) {
|
|
|
result = selectHLPatientList(dto);
|
|
|
} else if (resourceType.equals("munjin")) {
|
|
@@ -129,7 +131,7 @@ public class RestApiController {
|
|
|
//String[] strAr = {"temperature", "bloodPressure", "bloodSugar", "oxygenSaturation", "pulseRate"};
|
|
|
// result = selectVitalSign(dto);
|
|
|
} else {
|
|
|
- object.put("error", "invalidParameters");
|
|
|
+ object.put("error", "invalidResourceType");
|
|
|
return object.toString();
|
|
|
}
|
|
|
}
|
|
@@ -262,6 +264,39 @@ public class RestApiController {
|
|
|
return array.toString();
|
|
|
}
|
|
|
|
|
|
+ private String selectClinicMemoList(HlRequestDTO dto) {
|
|
|
+ List<ApiPhrResponseDTO> list = service.selectClinicMemo(dto);
|
|
|
+ JSONArray array = new JSONArray();
|
|
|
+
|
|
|
+ String resourceType = dto.getResourceType();
|
|
|
+ for (int i = 0; i < list.size(); i++) {
|
|
|
+ LinkedHashMap<String, Object> object = new LinkedHashMap<>();
|
|
|
+ String patientNumber = list.get(i).getPatientNumber();
|
|
|
+ String patientName = list.get(i).getPatientName();
|
|
|
+ String patientPhone = list.get(i).getPatientPhone();
|
|
|
+ String jumin = list.get(i).getJumin();
|
|
|
+ String clinicMemo = list.get(i).getValueType1();
|
|
|
+ String recordedByName = list.get(i).getRecordedByName();
|
|
|
+ String recordedById = list.get(i).getRecordedById();
|
|
|
+ String createDate = list.get(i).getCreateDate();
|
|
|
+
|
|
|
+ object.put("resourceType", resourceType);
|
|
|
+ object.put("patinetId", patientNumber);
|
|
|
+ object.put("patientName", patientName);
|
|
|
+ object.put("patientPhone", patientPhone);
|
|
|
+ object.put("birthDate", jumin);
|
|
|
+ object.put("clinicMemo", clinicMemo);
|
|
|
+ object.put("recordedByName", recordedByName);
|
|
|
+ object.put("recordedById", recordedById);
|
|
|
+ object.put("createDate", createDate);
|
|
|
+
|
|
|
+ String jsonText = JSONValue.toJSONString(object);
|
|
|
+ array.put(jsonText);
|
|
|
+ }
|
|
|
+
|
|
|
+ return array.toString();
|
|
|
+ }
|
|
|
+
|
|
|
private String selectMunjinDataList(HlRequestDTO dto) {
|
|
|
String resourceType = dto.getResourceType();
|
|
|
List<PatientDTO> list = service.selectMunjinDataList(dto);
|