문진 프로세스 전면 수정

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

@@ -30,7 +30,10 @@ public class MobileHistoryController  extends LifeCenterController {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     
     @Autowired
-    private MobilePatientService patientService;
+    private PatientService patientService;
+    
+    @Autowired
+    private MobilePatientService patientMService;
     
     @Autowired
     private PatientService pService;
@@ -45,7 +48,7 @@ public class MobileHistoryController  extends LifeCenterController {
         PatientHealthDTO historyData = new PatientHealthDTO();
         PatientDTO dto = new PatientDTO();
         dto.setPatientIdx(Integer.parseInt(patientIdx));
-        int cnt = patientService.selectMunJinCount(dto);
+        int cnt = patientMService.selectMunJinCount(dto);
         
         if( date.equals( "" ) ){
             date = LifeCenterFunction.getNow( "yyyy-MM-dd" );
@@ -99,17 +102,28 @@ public class MobileHistoryController  extends LifeCenterController {
     @RequestMapping("/serveyhistory")
     public ModelAndView serveyhistory(
             HttpServletRequest request, HttpServletResponse response) {
+        PatientDTO dto = new PatientDTO();
         String sesMpIdx  = LifeCenterSessionController.getSession(request, "sesMpIdx");
-        PatientDTO dto = patientService.selectMunjinHistoryOne(sesMpIdx);
+        dto.setPatientIdx(Integer.parseInt(sesMpIdx));
+        dto = patientService.selectPatientOne(dto);
         
         String hDate = dto.getHospitalizationDate();
         String cDate = dto.getConfirmationDate();
         String sDate = dto.getSymptomStartDate();
         String jumin = dto.getJumin();
-        hDate = hDate.split("-")[0] + "년 " + hDate.split("-")[1] + "월 " + hDate.split("-")[2] + "일";
-        cDate = cDate.split("-")[0] + "년 " + cDate.split("-")[1] + "월 " + cDate.split("-")[2] + "일";
-        sDate = sDate.split("-")[0] + "년 " + sDate.split("-")[1] + "월 " + sDate.split("-")[2] + "일";
-        jumin = jumin.split("-")[0] + "년 " + jumin.split("-")[1] + "월 " + jumin.split("-")[2] + "일";
+        
+        if (!hDate.equals("")) {
+            hDate = hDate.split("-")[0] + "년 " + hDate.split("-")[1] + "월 " + hDate.split("-")[2] + "일";
+        }
+        if (!cDate.equals("")) {
+            cDate = cDate.split("-")[0] + "년 " + cDate.split("-")[1] + "월 " + cDate.split("-")[2] + "일";
+        }
+        if (!sDate.equals("")) {
+            sDate = sDate.split("-")[0] + "년 " + sDate.split("-")[1] + "월 " + sDate.split("-")[2] + "일";
+        }
+        if (!jumin.equals("")) {
+            jumin = jumin.substring(0, 4) + "년 " + jumin.substring(4, 6) + "월 " + jumin.substring(6, 8) + "일";            
+        }
         
         dto.setHospitalizationDate(hDate);
         dto.setConfirmationDate(cDate);
@@ -229,7 +243,10 @@ public class MobileHistoryController  extends LifeCenterController {
         }
         
         strSymptom = strSymptom.trim();
-        strSymptom = strSymptom.substring(0, strSymptom.length() - 1);
+        if (!strSymptom.equals("")) {
+            strSymptom = strSymptom.substring(0, strSymptom.length() - 1);            
+        }
+        
         
         return strSymptom;
     }

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

@@ -7,6 +7,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
@@ -15,6 +17,7 @@ import com.lemon.lifecenter.common.LifeCenterController;
 import com.lemon.lifecenter.common.LifeCenterSessionController;
 import com.lemon.lifecenter.dto.PatientDTO;
 import com.lemon.lifecenter.service.MobilePatientService;
+import com.lemon.lifecenter.service.PatientService;
 
 @Controller
 @RequestMapping("/mobile")
@@ -23,14 +26,55 @@ public class MobileServeyController extends LifeCenterController {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
     
     @Autowired
-    private MobilePatientService patientService;
+    private PatientService patientService;
+    
+    @Autowired
+    private MobilePatientService patientMService;
     
     @RequestMapping("/servey")
-    public ModelAndView servey(HttpServletRequest request,HttpServletResponse response) {
+    public ModelAndView servey(
+            HttpServletRequest request,HttpServletResponse response,
+            @ModelAttribute("dto") PatientDTO patientDTO) {
+        String sesMpIdx  = LifeCenterSessionController.getSession( request, "sesMpIdx" );
+        
+        patientDTO.setPatientIdx(Integer.parseInt(sesMpIdx));
+        patientDTO = patientService.selectPatientOne( patientDTO );
+        String jumin = patientDTO.getJumin();
+        jumin = jumin.substring(0, 4) + "년 " + jumin.substring(4, 6) + "월 " + jumin.substring(6, 8) + "일";
+        patientDTO.setJumin(jumin);
+        
         ModelAndView mv = setMobileMV("servey/servey");
+        mv.addObject("info", patientDTO);
         return mv;
     }
     
+    @RequestMapping("/servey/write")
+    @Transactional(propagation=Propagation.REQUIRED)
+    public String serveyWrite(
+            @ModelAttribute("dto") final PatientDTO dto,
+            HttpServletRequest request,HttpServletResponse response) {
+        String sesMpIdx  = LifeCenterSessionController.getSession( request, "sesMpIdx" );
+        dto.setPatientIdx(Integer.parseInt(sesMpIdx));
+        dto.setUpdateBy(sesMpIdx);
+        
+        String bloodPressureLevelCon = dto.getBloodPressureLevelCon();
+        String bloodPressureLevelRel = dto.getBloodPressureLevelRel();
+        if (bloodPressureLevelCon.equals("")) {
+            dto.setBloodPressureLevelCon("0");
+        }
+        if (bloodPressureLevelRel.equals("")) {
+            dto.setBloodPressureLevelRel("0");
+        }
+        bloodPressureLevelCon = dto.getBloodPressureLevelCon();
+        bloodPressureLevelRel = dto.getBloodPressureLevelRel();
+        dto.setBloodPressureLevel(bloodPressureLevelCon + "|" + bloodPressureLevelRel);
+        
+        int pcCnt = patientService.updatePatientCareServey(dto);
+        patientService.updatePatientDisease(dto);
+        patientService.updatePatientSymptom(dto);
+        return "redirect:/mobile/menu";
+    }
+    
     @RequestMapping("/servey/insert")
     public String serveyInsert(
             @ModelAttribute("dto") final PatientDTO dto,
@@ -52,7 +96,7 @@ public class MobileServeyController extends LifeCenterController {
         bloodPressureLevelRel = dto.getBloodPressureLevelRel();
         dto.setBloodPressureLevel(bloodPressureLevelCon + "|" + bloodPressureLevelRel);
         
-        patientService.mobileInsertPatientMunjin(dto);
+        patientMService.mobileInsertPatientMunjin(dto);
         
         return "redirect:/mobile/menu";
     }

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

@@ -166,6 +166,15 @@ public class PatientController extends LifeCenterController {
         //patientSymptom Insert
         dto.setEtcCheck( dto.getEtcCheckSymptom() );
         dto.setEtcContent( dto.getEtcContentSymptom() );
+        
+        if (dto.getBloodPressureLevelCon().equals("")) {
+            dto.setBloodPressureLevelCon("0");
+        }
+        
+        if (dto.getBloodPressureLevelRel().equals("")) {
+            dto.setBloodPressureLevelRel("0");
+        }
+        
         dto.setBloodPressureLevel( dto.getBloodPressureLevelCon() + "|" + dto.getBloodPressureLevelRel() );
         
         patientService.insertPatientSymptom( dto );
@@ -440,7 +449,10 @@ public class PatientController extends LifeCenterController {
         }
         
         strSymptom = strSymptom.trim();
-        strSymptom = strSymptom.substring(0, strSymptom.length() - 1);
+        if (!strSymptom.equals("")) {
+            strSymptom = strSymptom.substring(0, strSymptom.length() - 1);
+        }
+        
         
         return strSymptom;
     }

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

@@ -7,7 +7,7 @@ public class PatientDTO {
     // patient_care
     private int patientIdx;
     private String patientName;
-    private String gender;
+    private String gender = "";
     private String wardNumber;
     private String roomNumber;
     private String finamClinicDate;
@@ -20,8 +20,8 @@ public class PatientDTO {
     private String symptomStartDate;
     private String confirmationDate;
     private String disisolationDate;
-    private String basalDiseaseYn;
-    private String drugYn;
+    private String basalDiseaseYn = "N";
+    private String drugYn="N";
     private String drugContent;
     private String pregnancyStatus;
     private String pregnancyWeek;
@@ -53,11 +53,11 @@ public class PatientDTO {
     private String heartDisease="N";
     private String liverDisease="N";
     private String operation="N";
-    private String operationContent;
+    private String operationContent="";
     private String allergyCheck="N";
     private String kidneyDisease="N";
     private String cancerCheck="N";
-    private String cancerName;
+    private String cancerName="";
     private String etcCheck="N";
     private String etcContent="";
     private String etcCheckDisease="N";

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

@@ -25,4 +25,5 @@ public interface PatientMapper {
     public PatientHealthDTO selectPatientPhrHistoryData( PatientHealthDTO dto );
     public int selectPatientSymptomSimTotal( PatientHealthDTO dto );
     public List<PatientDTO> selectPatientSymptomSimData( PatientHealthDTO dto );
+    public int updatePatientCareServey(PatientDTO dto);
 }

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

@@ -59,4 +59,7 @@ public class PatientService {
     public List<PatientDTO> selectPatientSymptomSimData( PatientHealthDTO dto ) {
         return mapper.selectPatientSymptomSimData(dto);
     }
+    public int updatePatientCareServey(PatientDTO dto) {
+        return mapper.updatePatientCareServey(dto);
+    }
 }

src/main/resources/mybatis/mapper/mobile/munjin.xml

@@ -5,9 +5,10 @@
 
     <select id="selectMunJinCount" parameterType="PatientDTO" resultType="int">
         <![CDATA[
-            SELECT COUNT(*) CNT
-              FROM MUNJIN
-             WHERE PATIENT_IDX = #{patientIdx}
+            SELECT COUNT(*) AS CNT
+              FROM patient_care
+             WHERE patient_idx = #{patientIdx}
+               AND update_date IS NOT null;
         ]]>
     </select>
     <insert id="mobileInsertPatientMunjin" parameterType="PatientDTO">
@@ -39,11 +40,11 @@
     <select id="selectMunjinHistoryOne" parameterType="string" resultType="PatientDTO">
         <![CDATA[
             SELECT PATIENT_IDX                                   AS patientIdx,
-                   DATE_FORMAT(HOSPITALIZATION_DATE, '%Y-%m-%d') AS hospitalizationDate,
-                   DATE_FORMAT(CV_CONFIRMATION_DATE, '%Y-%m-%d') AS confirmationDate,
-                   DATE_FORMAT(SYMPTOM_START_DATE, '%Y-%m-%d')   AS symptomStartDate,
+                   HOSPITALIZATION_DATE                          AS hospitalizationDate,
+                   CV_CONFIRMATION_DATE                          AS confirmationDate,
+                   SYMPTOM_START_DATE                            AS symptomStartDate,
                    GENDER                                        AS gender,
-                   DATE_FORMAT(BIRTHDAY, '%Y-%m-%d')             AS jumin,
+                   BIRTHDAY                                      AS jumin,
                    BASAL_DISEASE_YN                              AS basalDiseaseYn,
                    HIGH_BLOOD_PRESSURE_CHECK                     AS highBloodPressureCheck,
                    LOW_BLOOD_PRESSURE_CHECK                      AS lowBloodPressureCheck,

src/main/resources/mybatis/mapper/patient/patient.xml

@@ -243,6 +243,15 @@
         ]]>
     </update>
     
+    <update id="updatePatientCareServey" parameterType="PatientDTO" useGeneratedKeys="true">
+        <![CDATA[
+            UPDATE PATIENT_CARE
+               SET UPDATE_DATE = NOW(),
+                   UPDATE_BY   = #{updateBy}
+             WHERE PATIENT_IDX = #{patientIdx}
+        ]]>
+    </update>
+    
     <update id="updatePatientDisease" parameterType="PatientDTO" useGeneratedKeys="true">
         <![CDATA[
             UPDATE patient_disease

src/main/webapp/WEB-INF/jsp/mobile/servey/servey.jsp

@@ -182,7 +182,7 @@ function setEventHandler() {
             </div>
             <c:set var="now" value="<%=new java.util.Date()%>" />
             <c:set var="sysYear"><fmt:formatDate value="${now}" pattern="yyyy" /></c:set>
-            <c:set var="action" value="/mobile/servey/insert" />
+            <c:set var="action" value="/mobile/servey/write" />
             
             <form id="patientForm" action="${action}" method="post">
                 <div class="check_list" id="check_list1">
@@ -191,36 +191,9 @@ function setEventHandler() {
                             1. 입원일을 입력 하세요.
                         </div>
                         <div class="date">
-                            <div class="year">
-                                <select class="custom-select select-date date-year">
-                                      <option value="" selected="">년</option>
-                                      <c:forEach var="y" begin="1940" end="${sysYear}" step="1">
-                                          <option value="${y}">${y} 년</option>
-                                      </c:forEach>
-                                </select>
-    <!--                             <select> -->
-    <!--                                 <option>1900</option> -->
-    <!--                             </select> 년 -->
-                            </div>
-                            <div class="month">
-    <!--                             <input type="text" name=""> 월 -->
-                                <select class="custom-select select-date date-month">
-                                      <option value="" selected="">월</option>
-                                      <c:forEach var="m" begin="1" end="12" step="1">
-                                          <option value="${m}">${m} 월</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <div class="day">
-    <!--                             <input type="text" name=""> 일 -->
-                                <select class="custom-select select-date date-day">
-                                      <option value="" selected="">일</option>
-                                      <c:forEach var="d" begin="1" end="31" step="1">
-                                          <option value="${d}">${d} 일</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                        <input type="text" class="error-box" name="hospitalizationDate">
+                            <fmt:parseDate var="hDate" value="${info.hospitalizationDate}" pattern="yyyy-MM-dd HH:mm" />
+                            <c:set var="hospitalizationDate"><fmt:formatDate value="${hDate}" pattern="yyyy년 MM월 dd일 HH시 mm분" /></c:set>
+                            <c:out value="${hospitalizationDate}" />
                         </div>
                     </div>
                     <div class="part">
@@ -228,33 +201,11 @@ function setEventHandler() {
                             2. 코로나 19 확진일을 입력 하세요
                         </div>
                         <div class="date">
-                            <div class="year">
-                                <select class="custom-select select-date date-year">
-                                      <option value="" selected="">년</option>
-                                      <c:forEach var="y" begin="1940" end="${sysYear}" step="1">
-                                          <option value="${y}">${y} 년</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <div class="month">
-    <!--                             <input type="text" name=""> 월 -->
-                                <select class="custom-select select-date date-month">
-                                      <option value="" selected="">월</option>
-                                      <c:forEach var="m" begin="1" end="12" step="1">
-                                          <option value="${m}">${m} 월</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <div class="day">
-    <!--                             <input type="text" name=""> 일 -->
-                                <select class="custom-select select-date date-day">
-                                      <option value="" selected="">일</option>
-                                      <c:forEach var="d" begin="1" end="31" step="1">
-                                          <option value="${d}">${d} 일</option>
-                                      </c:forEach>
-                                </select>
+                            <div class="date">
+                                <fmt:parseDate var="cDate" value="${info.confirmationDate}" pattern="yyyy-MM-dd" />
+                                <c:set var="confirmationDate"><fmt:formatDate value="${cDate}" pattern="yyyy년 MM월 dd일" /></c:set>
+                                <c:out value="${confirmationDate}" />
                             </div>
-                            <input type="text" class="error-box" name="confirmationDate">
                         </div>
                     </div>
                     <div class="part">
@@ -262,31 +213,9 @@ function setEventHandler() {
                             3. 증상 시작일을 입력 하세요.
                         </div>
                         <div class="date">
-                            <div class="year">
-                                <select class="custom-select select-date date-year">
-                                      <option value="" selected="">년</option>
-                                      <c:forEach var="y" begin="1940" end="${sysYear}" step="1">
-                                          <option value="${y}">${y} 년</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <div class="month">
-                                <select class="custom-select select-date date-month">
-                                      <option value="" selected="">월</option>
-                                      <c:forEach var="m" begin="1" end="12" step="1">
-                                          <option value="${m}">${m} 월</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <div class="day">
-                                <select class="custom-select select-date date-day">
-                                      <option value="" selected="">일</option>
-                                      <c:forEach var="d" begin="1" end="31" step="1">
-                                          <option value="${d}">${d} 일</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <input type="text" class="error-box" name="symptomStartDate">
+                            <fmt:parseDate var="sDate" value="${info.symptomStartDate}" pattern="yyyy-MM-dd" />
+                            <c:set var="symptomStartDate"><fmt:formatDate value="${sDate}" pattern="yyyy년 MM월 dd일" /></c:set>
+                            <c:out value="${symptomStartDate}" />
                         </div>
                     </div>
                     <div class="part">
@@ -294,16 +223,8 @@ function setEventHandler() {
                             4. 성별을 입력하세요.
                         </div>
                         <div class="list">
-                            <ul class="circle half">
-                                <li>
-                                    <input type="radio" id="gender1" name="gender" value="M">
-                                    <label for="gender1"><span></span>남</label>
-                                </li>
-                                <li>
-                                    <input type="radio" id="gender2" name="gender" value="F">
-                                    <label for="gender2"><span></span>여</label>
-                                </li>
-                            </ul>
+                            <c:if test="${info.gender eq 'M'}">남</c:if>
+                            <c:if test="${info.gender eq 'F'}">여</c:if>
                         </div>
                     </div>
                     <div class="part">
@@ -311,31 +232,7 @@ function setEventHandler() {
                             5. 생년월일을 입력 하세요
                         </div>
                         <div class="date">
-                            <div class="year">
-                                <select class="custom-select select-date date-year">
-                                      <option value="" selected="">년</option>
-                                      <c:forEach var="y" begin="1940" end="${sysYear}" step="1">
-                                          <option value="${y}">${y} 년</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <div class="month">
-                                <select class="custom-select select-date date-month">
-                                      <option value="" selected="">월</option>
-                                      <c:forEach var="m" begin="1" end="12" step="1">
-                                          <option value="${m}">${m} 월</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <div class="day">
-                                <select class="custom-select select-date date-day">
-                                      <option value="" selected="">일</option>
-                                      <c:forEach var="d" begin="1" end="31" step="1">
-                                          <option value="${d}">${d} 일</option>
-                                      </c:forEach>
-                                </select>
-                            </div>
-                            <input type="text" class="error-box" name="jumin">
+                            <c:out value="${info.jumin}" />
                         </div>
                     </div>
                     <div class="part">
@@ -349,7 +246,7 @@ function setEventHandler() {
                                     <label for="diseaseY"><span></span>예</label>
                                 </li>
                                 <li>
-                                    <input type="radio" id="diseaseN" name="basalDiseaseYn" value="N">
+                                    <input type="radio" id="diseaseN" name="basalDiseaseYn" value="N" checked="checked">
                                     <label for="diseaseN"><span></span>아니오</label>
                                 </li>
                             </ul>
@@ -551,58 +448,38 @@ function setEventHandler() {
                     </div>
                     <div class="part">
                         <div class="title">
-                            14. 최근 24시간 이내 약 복용 여부를 체크하세요.
+                            14. 최근 24시간 이내 약 복용 여부
                         </div>
                         <div class="list">
-                            <ul class="circle half">
-                                <li>
-                                    <input type="radio" id="drugYn1" name="drugYn" value="Y">
-                                    <label for="drugYn1"><span></span>예</label>
-                                </li>
-                                <li>
-                                    <input type="radio" id="drugYn2" name="drugYn" value="N">
-                                    <label for="drugYn2"><span></span>아니오</label>
-                                </li>
-                            </ul>
+                            <c:if test="${info.drugYn eq 'Y'}">예</c:if>
+                            <c:if test="${info.drugYn ne 'Y'}">아니오</c:if>
                         </div>
                     </div>
                     <div class="part">
                         <div class="title">
-                            15. 14번의 ”예“인 경우 약명을 입력 하세요
-                            <span class="mini">(만일 ”아니오“ 경우에는 입력하지 마세요)</span>
+                            15. 약명
+<!--                             <span class="mini">(만일 ”아니오“ 경우에는 입력하지 마세요)</span> -->
                         </div>
                         <div class="data">
-                            <label class="inline">
-                                약명 ( <input type="text" name="drugContent" style="max-width:120px;"> )
-                            </label>
+                            <c:out value="${info.drugContent}"></c:out>
                         </div>
                     </div>
                     <div class="part">
                         <div class="title">
-                            16. 임신 여부를 체크하세요.
-                        </div>
-                        <div class="list">
-                            <ul class="circle half">
-                                <li>
-                                    <input type="radio" id="pregnancyStatus1" name="pregnancyStatus" value="Y" />
-                                    <label for="pregnancyStatus1"><span></span>예</label>
-                                </li>
-                                <li>
-                                    <input type="radio" id="pregnancyStatus2" name="pregnancyStatus" value="N" />
-                                    <label for="pregnancyStatus2"><span></span>아니오</label>
-                                </li>
-                            </ul>
+                            16. 임신 여부
                         </div>
+                            <div class="list">
+                                <c:if test="${info.pregnancyStatus eq 'Y'}">예</c:if>
+                                <c:if test="${info.pregnancyStatus ne 'Y'}">아니오</c:if>
+                            </div>
                     </div>
                     <div class="part">
                         <div class="title">
-                            17. 16번의 ”예“인 경우 임신 주차를 입력 하세요
-                            <span class="mini">(만일 ”아니오“ 경우에는 입력하지 마세요)</span>
+                            17. 임신주차
+<!--                             <span class="mini">(만일 ”아니오“ 경우에는 입력하지 마세요)</span> -->
                         </div>
                         <div class="data">
-                            <label class="inline">
-                                임신 주차 ( <input type="text" name="pregnancyWeek" onkeypress="onlyNumber();"> ) 주
-                            </label>
+                            <c:out value="임신주차 : ${info.pregnancyWeek}주차"></c:out>
                         </div>
                     </div>
                 </div>

src/main/webapp/WEB-INF/jsp/patient/new.jsp

@@ -321,14 +321,14 @@ $( function(){
                                                     </td>
                                                 </tr>
                                                 <tr>
-                                                    <th>최근약복용<br />(최근 24시간 이내)</th>
+                                                    <th><span class="fix">*</span>최근약복용<br />(최근 24시간 이내)</th>
                                                     <td>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" value="N" name="drugYn" onclick="$('#drugContent').attr('readonly', true);">
+                                                            <input class="form-check-input" type="radio" value="N" name="drugYn" onclick="$('#drugContent').attr('readonly', true);" required>
                                                             <span class="form-check-label">미복용</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">
-                                                            <input class="form-check-input" type="radio" value="Y" name="drugYn" onclick="$('#drugContent').removeAttr('readonly');">
+                                                            <input class="form-check-input" type="radio" value="Y" name="drugYn" onclick="$('#drugContent').removeAttr('readonly');" required>
                                                             <span class="form-check-label">복용</span>
                                                         </label>
                                                         <label class="form-check form-check-inline">