Merge branch 'simplatform' of http://wcollector.idatabank.com:5230/dbs289/LifeCenter into simplatform

src/main/java/com/lemon/lifecenter/controller/ClinicController.java

@@ -1110,11 +1110,11 @@ public class ClinicController extends LifeCenterController {
 		}
 	}
 
-	@RequestMapping(value = "/api/configuration", method = RequestMethod.PUT)
-	public @ResponseBody String updateConfigurationAPI(@ModelAttribute("dto") final ClinicConfigurationDTO dto) {
+	@RequestMapping(value = "/api/configuration/display", method = RequestMethod.PATCH)
+	public @ResponseBody String updateDisplayConfigurationAPI(@ModelAttribute("dto") final ClinicConfigurationDTO dto) {
 
 		try {
-			clinicService.updateConfiguration(dto);
+			clinicService.updateDisplayConfiguration(dto);
 
 			JSONObject json = new JSONObject();
 
@@ -1130,6 +1130,28 @@ public class ClinicController extends LifeCenterController {
 
 			return json.toString();
 		}
-  }
+    }
+	
+	@RequestMapping(value = "/api/configuration/threshold", method = RequestMethod.PATCH)
+	public @ResponseBody String updateThresholdConfigurationAPI(@ModelAttribute("dto") final ClinicConfigurationDTO dto) {
+
+		try {
+			clinicService.updateThresholdConfiguration(dto);
+
+			JSONObject json = new JSONObject();
+
+			json.put("code", "00");
+			json.put("message", "");
+
+			return json.toString();
+		} catch (Exception e) {
+			JSONObject json = new JSONObject();
+
+			json.put("code", "01");
+			json.put("message", e.getLocalizedMessage());
+
+			return json.toString();
+		}
+    }
 }
 

src/main/java/com/lemon/lifecenter/dto/ClinicConfigurationDTO.java

@@ -6,8 +6,7 @@ public class ClinicConfigurationDTO {
 	private String temparatureDisplayYN;
 	private String oxygenSaturationDisplayYN;
 	private String pulseRateDisplayYN;
-	private String systolicBloodPressureDisplayYN;
-	private String diastolicBloodPressureDisplayYN;
+	private String bloodPressureDisplayYN;
 	private String bloodSugarDisplayYN;
 	private String symptomDisplayYN;
 	
@@ -48,18 +47,12 @@ public class ClinicConfigurationDTO {
 	public void setPulseRateDisplayYN(String pulseRateDisplayYN) {
 		this.pulseRateDisplayYN = pulseRateDisplayYN;
 	}
-	public String getSystolicBloodPressureDisplayYN() {
-		return systolicBloodPressureDisplayYN;
-	}
-	public void setSystolicBloodPressureDisplayYN(String systolicBloodPressureDisplayYN) {
-		this.systolicBloodPressureDisplayYN = systolicBloodPressureDisplayYN;
-	}
-	public String getDiastolicBloodPressureDisplayYN() {
-		return diastolicBloodPressureDisplayYN;
-	}
-	public void setDiastolicBloodPressureDisplayYN(String diastolicBloodPressureDisplayYN) {
-		this.diastolicBloodPressureDisplayYN = diastolicBloodPressureDisplayYN;
+	public String getBloodPressureDisplayYN() {
+		return bloodPressureDisplayYN;
 	}
+	public void setBloodPressureDisplayYN(String bloodPressureDisplayYN) {
+		this.bloodPressureDisplayYN = bloodPressureDisplayYN;
+	}	
 	public String getBloodSugarDisplayYN() {
 		return bloodSugarDisplayYN;
 	}

src/main/java/com/lemon/lifecenter/mapper/ClinicConfigurationMapper.java

@@ -16,7 +16,9 @@ public interface ClinicConfigurationMapper {
 	
 	public ClinicConfigurationDTO selectConfigurationWithPatient(ClinicConfigurationDTO dto);
 	
-	public void updateConfiguration(ClinicConfigurationDTO dto);
+	public void updateDisplayConfiguration(ClinicConfigurationDTO dto);
+	
+	public void updateThresholdConfiguration(ClinicConfigurationDTO dto);
 	
 	public void deleteConfiguration(ClinicConfigurationDTO dto);
 	

src/main/java/com/lemon/lifecenter/service/ClinicService.java

@@ -60,8 +60,12 @@ public class ClinicService {
     	return mapperConfiguration.selectConfiguration(dto);
     }
     
-    public void updateConfiguration(ClinicConfigurationDTO dto) {
-    	mapperConfiguration.updateConfiguration(dto);
+    public void updateDisplayConfiguration(ClinicConfigurationDTO dto) {
+    	mapperConfiguration.updateDisplayConfiguration(dto);
+    }
+    
+    public void updateThresholdConfiguration(ClinicConfigurationDTO dto) {
+    	mapperConfiguration.updateThresholdConfiguration(dto);
     }
     
     public void deleteConfiguration(ClinicConfigurationDTO dto) {

src/main/resources/mybatis/mapper/center/clinicConfiguration.xml

@@ -9,15 +9,14 @@
 		temparature_display_yn,
 		oxygen_saturation_display_yn,
 		pulse_rate_display_yn,
-		systolic_blood_pressure_display_yn,
-		diastolic_blood_pressure_display_yn,
+		blood_pressure_display_yn,
 		blood_sugar_display_yn,
 		symptom_display_yn,
 		temparature_threshold,
 		systolic_blood_pressure_threshold_min,
 		systolic_blood_pressure_threshold_max,
-		diastolic_blood_pressure_threshole_min,
-		diastolic_blood_pressure_threshole_max,
+		diastolic_blood_pressure_threshold_min,
+		diastolic_blood_pressure_threshold_max,
 		pulse_rate_threshold_min,
 		pulse_rate_threshold_max,
 		oxygen_saturation_threshold,
@@ -31,7 +30,6 @@
 		'Y',
 		'N',
 		'Y',
-		'Y',
 		'N',
 		'Y',
 		37.5,
@@ -55,15 +53,14 @@
 				temparature_display_yn					AS temparatureDisplayYN,
 				oxygen_saturation_display_yn			AS oxygenSaturationDisplayYN,
 				pulse_rate_display_yn					AS pulseRateDisplayYN,
-				systolic_blood_pressure_display_yn		AS systolicBloodPressureDisplayYN,
-				diastolic_blood_pressure_display_yn		AS diastolicBloodPressureDisplayYNo,
+				blood_pressure_display_yn				AS bloodPressureDisplayYN,
 				blood_sugar_display_yn					AS bloodSugarDisplayYN,
 				symptom_display_yn						AS symptomDisplayYN,
 				temparature_threshold					AS temparatureThreshold,
 				systolic_blood_pressure_threshold_min	AS systolicBloodPressureThresholdMin,
 				systolic_blood_pressure_threshold_max	AS systolicBloodPressureThresholdMax,
-				diastolic_blood_pressure_threshole_min	AS diastolicBloodPressureThresholdMin,
-				diastolic_blood_pressure_threshole_max	AS diastolicBloodPressureThresholdMax,
+				diastolic_blood_pressure_threshold_min	AS diastolicBloodPressureThresholdMin,
+				diastolic_blood_pressure_threshold_max	AS diastolicBloodPressureThresholdMax,
 				pulse_rate_threshold_min				AS pulseRateThresholdMin,
 				pulse_rate_threshold_max				AS pulseRateThresholdMax,
 				oxygen_saturation_threshold				AS oxygenSaturationThreshold,
@@ -80,15 +77,14 @@
 				c.temparature_display_yn					AS temparatureDisplayYN,
 				c.oxygen_saturation_display_yn				AS oxygenSaturationDisplayYN,
 				c.pulse_rate_display_yn						AS pulseRateDisplayYN,
-				c.systolic_blood_pressure_display_yn		AS systolicBloodPressureDisplayYN,
-				c.diastolic_blood_pressure_display_yn		AS diastolicBloodPressureDisplayYNo,
+				c.blood_pressure_display_yn					AS bloodPressureDisplayYN,
 				c.blood_sugar_display_yn					AS bloodSugarDisplayYN,
 				c.symptom_display_yn						AS symptomDisplayYN,
 				c.temparature_threshold						AS temparatureThreshold,
 				c.systolic_blood_pressure_threshold_min		AS systolicBloodPressureThresholdMin,
 				c.systolic_blood_pressure_threshold_max		AS systolicBloodPressureThresholdMax,
-				c.diastolic_blood_pressure_threshole_min	AS diastolicBloodPressureThresholdMin,
-				c.diastolic_blood_pressure_threshole_max	AS diastolicBloodPressureThresholdMax,
+				c.diastolic_blood_pressure_threshold_min	AS diastolicBloodPressureThresholdMin,
+				c.diastolic_blood_pressure_threshold_max	AS diastolicBloodPressureThresholdMax,
 				c.pulse_rate_threshold_min					AS pulseRateThresholdMin,
 				c.pulse_rate_threshold_max					AS pulseRateThresholdMax,
 				c.oxygen_saturation_threshold				AS oxygenSaturationThreshold,
@@ -101,22 +97,28 @@
 			c.center_code = p.center_code
 	]]>
     </select>
-    <update id="updateConfiguration" parameterType="ClinicConfigurationDTO">
+    <update id="updateDisplayConfiguration" parameterType="ClinicConfigurationDTO">
 	<![CDATA[
 	    UPDATE	clinic_configuration
 	       SET	update_date								= NOW(),	
 	       		temparature_display_yn					= #{temparatureDisplayYN},
 				oxygen_saturation_display_yn			= #{oxygenSaturationDisplayYN},
 				pulse_rate_display_yn					= #{pulseRateDisplayYN},
-				systolic_blood_pressure_display_yn		= #{systolicBloodPressureDisplayYN},
-				diastolic_blood_pressure_display_yn		= #{diastolicBloodPressureDisplayYNo},
+				blood_pressure_display_yn				= #{bloodPressureDisplayYN},
 				blood_sugar_display_yn					= #{bloodSugarDisplayYN},
-				symptom_display_yn						= #{symptomDisplayYN},
+				symptom_display_yn						= #{symptomDisplayYN}
+			center_code = #{centerCode}
+	]]>
+    </update>
+    <update id="updateThresholdConfiguration" parameterType="ClinicConfigurationDTO">
+	<![CDATA[
+	    UPDATE	clinic_configuration
+	       SET	update_date								= NOW(),		       		
 				temparature_threshold					= #{temparatureThreshold},
 				systolic_blood_pressure_threshold_min	= #{systolicBloodPressureThresholdMin},
 				systolic_blood_pressure_threshold_max	= #{systolicBloodPressureThresholdMax},
-				diastolic_blood_pressure_threshole_min	= #{diastolicBloodPressureThresholdMin},
-				diastolic_blood_pressure_threshole_max	= #{diastolicBloodPressureThresholdMax},
+				diastolic_blood_pressure_threshold_min	= #{diastolicBloodPressureThresholdMin},
+				diastolic_blood_pressure_threshold_max	= #{diastolicBloodPressureThresholdMax},
 				pulse_rate_threshold_min				= #{pulseRateThresholdMin},
 				pulse_rate_threshold_max				= #{pulseRateThresholdMax},
 				oxygen_saturation_threshold				= #{oxygenSaturationThreshold},