瀏覽代碼

서용하 똥치우는 중

강성희 6 年之前
父節點
當前提交
6d99df04f9

+ 101 - 115
MCPlus/Base.lproj/Main.storyboard

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="WSz-h3-e9R">
-    <device id="retina5_9" orientation="portrait">
+    <device id="retina6_1" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
@@ -21,15 +21,15 @@
             <objects>
                 <viewController storyboardIdentifier="ExtraWebViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="nDd-yG-OzX" customClass="ExtraWebViewController" customModule="kunkuk" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ueR-nN-xEe">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bvY-we-jch" customClass="StoryBoardableWKWebView" customModule="kunkuk" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="44" width="375" height="674"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="758"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                             <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" barStyle="black" translatesAutoresizingMaskIntoConstraints="NO" id="RZz-La-LDk">
-                                <rect key="frame" x="0.0" y="718" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="802" width="414" height="60"/>
                                 <color key="backgroundColor" red="0.058823529409999999" green="0.1843137255" blue="0.47450980390000003" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="60" id="rdF-9T-D2r"/>
@@ -83,7 +83,7 @@
             <objects>
                 <navigationController storyboardIdentifier="WebviewNavigationController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="WSz-h3-e9R" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="ocH-x4-xiF">
-                        <rect key="frame" x="0.0" y="44" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -99,11 +99,11 @@
             <objects>
                 <viewController storyboardIdentifier="Test2ViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="IB0-Up-J7N" customClass="Test2ViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="9s2-je-UzA">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qOp-k6-iGj">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fTn-Tu-UyJ">
@@ -139,17 +139,17 @@
             <objects>
                 <viewController storyboardIdentifier="PictureViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="IUL-tO-62n" customClass="PictureViewController" customModule="kunkuk" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="cey-dQ-ZA5">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Pub-Ed-9mn">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                 <connections>
                                     <segue destination="vG9-SK-zG4" kind="embed" id="9hA-fj-dZ7"/>
                                 </connections>
                             </containerView>
                             <containerView hidden="YES" opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Ae-P7-0Xz">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                                 <connections>
                                     <segue destination="HAU-b8-2L8" kind="embed" id="fhe-kt-nhW"/>
                                 </connections>
@@ -183,20 +183,20 @@
             <objects>
                 <viewController storyboardIdentifier="CustomCameraViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="vG9-SK-zG4" customClass="CustomCameraViewController" customModule="kunkuk" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="qCj-GS-Fhf">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="22g-sz-Ri6">
-                                <rect key="frame" x="0.0" y="44" width="375" height="48"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="48"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="환부이미지촬영" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Gz-wR-Tkc">
-                                        <rect key="frame" x="127" y="13.666666666666664" width="121.33333333333331" height="21"/>
+                                        <rect key="frame" x="146.5" y="13.5" width="121.5" height="21"/>
                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="close_x" translatesAutoresizingMaskIntoConstraints="NO" id="Vnl-oE-eK1">
-                                        <rect key="frame" x="346" y="13.666666666666664" width="21" height="21"/>
+                                        <rect key="frame" x="385" y="13.5" width="21" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="21" id="2kE-2l-aZX"/>
                                             <constraint firstAttribute="width" secondItem="Vnl-oE-eK1" secondAttribute="height" multiplier="1:1" id="TrO-Dh-uJa"/>
@@ -213,7 +213,7 @@
                                 </constraints>
                             </view>
                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QiK-PL-Z18">
-                                <rect key="frame" x="8" y="92" width="359" height="110"/>
+                                <rect key="frame" x="8" y="92" width="398" height="111"/>
                                 <color key="backgroundColor" red="0.94901960784313721" green="0.95294117647058818" blue="0.95686274509803915" alpha="1" colorSpace="calibratedRGB"/>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -222,19 +222,19 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <stackView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Hjm-3n-PnS">
-                                <rect key="frame" x="8" y="92" width="359" height="110"/>
+                                <rect key="frame" x="8" y="92" width="398" height="111"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3cc-tr-RLg">
-                                        <rect key="frame" x="0.0" y="0.0" width="119.66666666666667" height="110"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="132.5" height="111"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="홍길동" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZS3-lT-QK3">
-                                                <rect key="frame" x="35.333333333333329" y="17" width="49.333333333333329" height="20"/>
+                                                <rect key="frame" x="41.5" y="17" width="49.5" height="20"/>
                                                 <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fKT-hb-N98">
-                                                <rect key="frame" x="0.0" y="54" width="119.66666666666667" height="39"/>
+                                                <rect key="frame" x="0.0" y="55" width="132.5" height="39"/>
                                                 <attributedString key="attributedText">
                                                     <fragment content="내용">
                                                         <attributes>
@@ -268,16 +268,10 @@
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HsK-mM-rVT">
-                                        <rect key="frame" x="119.66666666666666" y="0.0" width="119.66666666666666" height="110"/>
+                                        <rect key="frame" x="132.5" y="0.0" width="133" height="111"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A1000100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4un-kx-8PH">
-                                                <rect key="frame" x="0.0" y="17" width="119.66666666666667" height="20"/>
-                                                <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
-                                                <nil key="textColor"/>
-                                                <nil key="highlightedColor"/>
-                                            </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ecd-Ow-N4X">
-                                                <rect key="frame" x="0.0" y="54" width="119.66666666666667" height="39"/>
+                                                <rect key="frame" x="0.0" y="55" width="133" height="39"/>
                                                 <attributedString key="attributedText">
                                                     <fragment>
                                                         <string key="content">내용 텍스트 
@@ -290,12 +284,17 @@
                                                 </attributedString>
                                                 <nil key="highlightedColor"/>
                                             </label>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A1000100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4un-kx-8PH">
+                                                <rect key="frame" x="22" y="17" width="89" height="20"/>
+                                                <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
+                                                <nil key="textColor"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
-                                            <constraint firstItem="Ecd-Ow-N4X" firstAttribute="centerX" secondItem="4un-kx-8PH" secondAttribute="centerX" id="3JV-zp-UxY"/>
+                                            <constraint firstAttribute="centerX" secondItem="4un-kx-8PH" secondAttribute="centerX" id="3JV-zp-UxY"/>
                                             <constraint firstAttribute="trailing" secondItem="Ecd-Ow-N4X" secondAttribute="trailing" id="4Mk-SP-UiH"/>
-                                            <constraint firstItem="4un-kx-8PH" firstAttribute="leading" secondItem="HsK-mM-rVT" secondAttribute="leading" id="9ll-zO-Bjh"/>
                                             <constraint firstItem="4un-kx-8PH" firstAttribute="top" secondItem="HsK-mM-rVT" secondAttribute="top" constant="17" id="QWn-IJ-DRB"/>
                                             <constraint firstAttribute="bottom" secondItem="Ecd-Ow-N4X" secondAttribute="bottom" priority="750" constant="17" id="RhN-kn-DpX"/>
                                             <constraint firstItem="Ecd-Ow-N4X" firstAttribute="top" relation="greaterThanOrEqual" secondItem="4un-kx-8PH" secondAttribute="bottom" constant="17" id="pbv-2w-6Wm"/>
@@ -314,16 +313,16 @@
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="afj-P8-ON5">
-                                        <rect key="frame" x="239.33333333333334" y="0.0" width="119.66666666666666" height="110"/>
+                                        <rect key="frame" x="265.5" y="0.0" width="132.5" height="111"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20 / M" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KLU-Vc-9DU">
-                                                <rect key="frame" x="32.666666666666657" y="17" width="54.333333333333343" height="20"/>
+                                                <rect key="frame" x="39" y="17" width="54.5" height="20"/>
                                                 <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1NT-Lz-aBT">
-                                                <rect key="frame" x="0.0" y="54" width="119.66666666666667" height="39"/>
+                                                <rect key="frame" x="0.0" y="55" width="132.5" height="39"/>
                                                 <attributedString key="attributedText">
                                                     <fragment>
                                                         <string key="content">내용 텍스트 
@@ -371,10 +370,10 @@
                                 </userDefinedRuntimeAttributes>
                             </stackView>
                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x3X-mc-6dm">
-                                <rect key="frame" x="8" y="208" width="359" height="42"/>
+                                <rect key="frame" x="8" y="209" width="398" height="42"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018-10-10 외래 or 입원, 진료과" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mLD-MC-fGV">
-                                        <rect key="frame" x="16" y="11" width="327" height="20"/>
+                                        <rect key="frame" x="16" y="11" width="366" height="20"/>
                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                         <color key="textColor" red="0.39215686274509803" green="0.60392156862745094" blue="0.9882352941176471" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
@@ -394,28 +393,28 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Twe-8h-6Au">
-                                <rect key="frame" x="0.0" y="250" width="375" height="528"/>
+                                <rect key="frame" x="0.0" y="251" width="414" height="611"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dat-yv-K6v">
-                                        <rect key="frame" x="0.0" y="10" width="375" height="518"/>
+                                        <rect key="frame" x="0.0" y="10" width="414" height="601"/>
                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </view>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="camera_lo" translatesAutoresizingMaskIntoConstraints="NO" id="ME9-uU-UZ3">
-                                        <rect key="frame" x="92" y="173.66666666666669" width="191" height="191"/>
+                                        <rect key="frame" x="92" y="195.5" width="230" height="230"/>
                                         <constraints>
                                             <constraint firstAttribute="width" secondItem="ME9-uU-UZ3" secondAttribute="height" multiplier="1:1" id="DoM-A7-iEK"/>
                                         </constraints>
                                     </imageView>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="equalCentering" spacingType="standard" translatesAutoresizingMaskIntoConstraints="NO" id="CvO-ai-fc0">
-                                        <rect key="frame" x="22" y="472" width="331" height="50"/>
+                                        <rect key="frame" x="22" y="555" width="370" height="50"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="944-gk-cQs">
-                                                <rect key="frame" x="0.0" y="0.0" width="112.66666666666667" height="50"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="132" height="50"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <state key="normal" image="f_btn_list"/>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yhJ-JG-Awk">
-                                                <rect key="frame" x="120.66666666666666" y="0.0" width="90" height="50"/>
+                                                <rect key="frame" x="140" y="0.0" width="90" height="50"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="yhJ-JG-Awk" secondAttribute="height" multiplier="9:5" id="Seb-JO-wtA"/>
@@ -423,7 +422,7 @@
                                                 <state key="normal" image="f_btn_camera"/>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wva-cH-tSz">
-                                                <rect key="frame" x="218.66666666666666" y="0.0" width="112.33333333333334" height="50"/>
+                                                <rect key="frame" x="238" y="0.0" width="132" height="50"/>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <state key="normal" image="f_btn_back"/>
                                             </button>
@@ -495,23 +494,23 @@
             <objects>
                 <viewController storyboardIdentifier="PhotoViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="HAU-b8-2L8" customClass="PhotoViewController" customModule="kunkuk" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="XAP-9P-NF8">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zli-63-5CU">
-                                <rect key="frame" x="0.0" y="44" width="375" height="734"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="818"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jJc-rS-Zz1">
-                                        <rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="414" height="48"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="환부이미지관리" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3rO-EJ-s84">
-                                                <rect key="frame" x="127" y="13.666666666666664" width="121.33333333333331" height="21"/>
+                                                <rect key="frame" x="149.5" y="13" width="115.5" height="22.5"/>
                                                 <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="close_x" translatesAutoresizingMaskIntoConstraints="NO" id="FQZ-R2-nMR">
-                                                <rect key="frame" x="346" y="13.666666666666664" width="21" height="21"/>
+                                                <rect key="frame" x="385" y="13.5" width="21" height="21"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" secondItem="FQZ-R2-nMR" secondAttribute="height" multiplier="1:1" id="Ifa-7F-DNt"/>
                                                     <constraint firstAttribute="height" constant="21" id="qix-DM-fM5"/>
@@ -529,7 +528,7 @@
                                         </constraints>
                                     </view>
                                     <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="r5V-JC-o3A">
-                                        <rect key="frame" x="8" y="48" width="359" height="166"/>
+                                        <rect key="frame" x="8" y="48" width="398" height="166"/>
                                         <color key="backgroundColor" red="0.94901960780000005" green="0.95294117649999999" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                         <userDefinedRuntimeAttributes>
                                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -538,19 +537,19 @@
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                     <stackView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="kno-vo-6Tg">
-                                        <rect key="frame" x="8" y="48" width="359" height="166"/>
+                                        <rect key="frame" x="8" y="48" width="398" height="166"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Go7-gm-l99">
-                                                <rect key="frame" x="0.0" y="0.0" width="119.66666666666667" height="166"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="132.5" height="166"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="홍길동" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="caU-Qr-psb">
-                                                        <rect key="frame" x="35.333333333333329" y="17" width="49.333333333333329" height="20"/>
+                                                        <rect key="frame" x="43" y="17" width="47" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qe6-Vy-qzG">
-                                                        <rect key="frame" x="0.0" y="110" width="119.66666666666667" height="39"/>
+                                                        <rect key="frame" x="0.0" y="110" width="132.5" height="39"/>
                                                         <attributedString key="attributedText">
                                                             <fragment content="내용">
                                                                 <attributes>
@@ -584,16 +583,16 @@
                                                 </userDefinedRuntimeAttributes>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="drc-lw-GXk">
-                                                <rect key="frame" x="119.66666666666666" y="0.0" width="119.66666666666666" height="166"/>
+                                                <rect key="frame" x="132.5" y="0.0" width="133" height="166"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A1000100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wHc-QH-9WF">
-                                                        <rect key="frame" x="15.333333333333329" y="17" width="89" height="20"/>
+                                                        <rect key="frame" x="25.5" y="17" width="82" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vg7-0U-jun">
-                                                        <rect key="frame" x="0.0" y="110" width="119.66666666666667" height="39"/>
+                                                        <rect key="frame" x="0.0" y="110" width="133" height="39"/>
                                                         <attributedString key="attributedText">
                                                             <fragment>
                                                                 <string key="content">내용 텍스트 
@@ -629,16 +628,16 @@
                                                 </userDefinedRuntimeAttributes>
                                             </view>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TAQ-4o-dJk">
-                                                <rect key="frame" x="239.33333333333334" y="0.0" width="119.66666666666666" height="166"/>
+                                                <rect key="frame" x="265.5" y="0.0" width="132.5" height="166"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20 / M" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bv4-jp-Xep">
-                                                        <rect key="frame" x="32.666666666666657" y="17" width="54.333333333333343" height="20"/>
+                                                        <rect key="frame" x="40" y="17" width="52" height="21"/>
                                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B3J-gw-Uea">
-                                                        <rect key="frame" x="0.0" y="110" width="119.66666666666667" height="39"/>
+                                                        <rect key="frame" x="0.0" y="110" width="132.5" height="39"/>
                                                         <attributedString key="attributedText">
                                                             <fragment>
                                                                 <string key="content">내용 텍스트 
@@ -686,7 +685,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </stackView>
                                     <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="jxM-6x-cdr">
-                                        <rect key="frame" x="8" y="222" width="359" height="422"/>
+                                        <rect key="frame" x="8" y="222" width="398" height="506"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="40" minimumInteritemSpacing="10" id="RHq-rA-QGF">
                                             <size key="itemSize" width="50" height="50"/>
@@ -739,11 +738,11 @@
                                             </collectionViewCell>
                                         </cells>
                                         <collectionReusableView key="sectionHeaderView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="PhotoCollectionViewReusableView" id="HKO-B6-YDQ" customClass="PhotoCollectionViewReusableView" customModule="kunkuk" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="359" height="50"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="398" height="50"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018-10-10 외래 or 입원, 진료과" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Vh-vQ-SnK">
-                                                    <rect key="frame" x="16" y="15" width="327" height="27"/>
+                                                    <rect key="frame" x="16" y="15" width="366" height="27"/>
                                                     <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                     <color key="textColor" red="0.39215686274509803" green="0.60392156862745094" blue="0.9882352941176471" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -761,16 +760,16 @@
                                         </collectionReusableView>
                                     </collectionView>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5S7-UW-OKn">
-                                        <rect key="frame" x="0.0" y="644" width="375" height="40"/>
+                                        <rect key="frame" x="0.0" y="728" width="414" height="40"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Dps-Yw-UhW">
-                                                <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="414" height="40"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="29Q-a9-R1k">
-                                                        <rect key="frame" x="0.0" y="0.0" width="187.66666666666666" height="40"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="207" height="40"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chk_default" translatesAutoresizingMaskIntoConstraints="NO" id="xQ4-Tv-FEb" customClass="CheckImageButton" customModule="kunkuk" customModuleProvider="target">
-                                                                <rect key="frame" x="51.333333333333336" y="12.666666666666629" width="15.000000000000021" height="15"/>
+                                                                <rect key="frame" x="61" y="12.5" width="15" height="15"/>
                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" secondItem="xQ4-Tv-FEb" secondAttribute="height" multiplier="1:1" id="gAI-OZ-qwj"/>
@@ -783,7 +782,7 @@
                                                                 </userDefinedRuntimeAttributes>
                                                             </imageView>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="전체선택" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ccd-Kt-iF7">
-                                                                <rect key="frame" x="76.333333333333329" y="9.9999999999999982" width="58.999999999999986" height="20.333333333333329"/>
+                                                                <rect key="frame" x="86" y="10" width="59" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
@@ -798,10 +797,10 @@
                                                         </constraints>
                                                     </view>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GvB-Pr-Nvx">
-                                                        <rect key="frame" x="187.66666666666663" y="0.0" width="187.33333333333337" height="40"/>
+                                                        <rect key="frame" x="207" y="0.0" width="207" height="40"/>
                                                         <subviews>
                                                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chk_default" translatesAutoresizingMaskIntoConstraints="NO" id="vZ9-I9-ilh" customClass="CheckImageButton" customModule="kunkuk" customModuleProvider="target">
-                                                                <rect key="frame" x="51" y="12.666666666666629" width="15.000000000000014" height="15"/>
+                                                                <rect key="frame" x="61" y="12.5" width="15" height="15"/>
                                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="15" id="CjR-YQ-h11"/>
@@ -814,7 +813,7 @@
                                                                 </userDefinedRuntimeAttributes>
                                                             </imageView>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="전체환자" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Bj-pK-noF">
-                                                                <rect key="frame" x="76.000000000000028" y="9.9999999999999982" width="59" height="20.333333333333329"/>
+                                                                <rect key="frame" x="86" y="10" width="59" height="20.5"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
@@ -841,10 +840,10 @@
                                         </constraints>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="o06-9o-mAW">
-                                        <rect key="frame" x="8" y="684" width="359" height="50"/>
+                                        <rect key="frame" x="8" y="768" width="398" height="50"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="K9h-ae-LbQ">
-                                                <rect key="frame" x="0.0" y="0.0" width="359" height="50"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="398" height="50"/>
                                                 <subviews>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kib-cX-gbE">
                                                         <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
@@ -856,7 +855,7 @@
                                                         <state key="normal" image="baseline_cloud"/>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Mfw-5C-ES1">
-                                                        <rect key="frame" x="154.66666666666666" y="0.0" width="50" height="50"/>
+                                                        <rect key="frame" x="174" y="0.0" width="50" height="50"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" secondItem="Mfw-5C-ES1" secondAttribute="height" multiplier="1:1" id="bZS-H3-215"/>
@@ -864,7 +863,7 @@
                                                         <state key="normal" image="f_btn_a_camera"/>
                                                     </button>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bCe-v6-zcW">
-                                                        <rect key="frame" x="309" y="0.0" width="50" height="50"/>
+                                                        <rect key="frame" x="348" y="0.0" width="50" height="50"/>
                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" secondItem="bCe-v6-zcW" secondAttribute="height" multiplier="1:1" id="wzu-0k-YBL"/>
@@ -947,20 +946,20 @@
             <objects>
                 <viewController storyboardIdentifier="PhotoDetailViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="SMs-20-Sgw" customClass="PhotoDetailViewController" customModule="kunkuk" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ffa-hW-lBj">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="h8N-NJ-7Q4">
-                                <rect key="frame" x="0.0" y="44" width="375" height="48"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="48"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="환부이미지상세" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GFe-Mw-H6W">
-                                        <rect key="frame" x="127" y="13.666666666666664" width="121.33333333333331" height="21"/>
+                                        <rect key="frame" x="146.5" y="13.5" width="121.5" height="21"/>
                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="close_x" translatesAutoresizingMaskIntoConstraints="NO" id="par-Va-bpc">
-                                        <rect key="frame" x="346" y="13.666666666666664" width="21" height="21"/>
+                                        <rect key="frame" x="385" y="13.5" width="21" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="21" id="3wW-Ch-M3u"/>
                                             <constraint firstAttribute="width" secondItem="par-Va-bpc" secondAttribute="height" multiplier="1:1" id="LXG-BG-Xf4"/>
@@ -978,7 +977,7 @@
                                 </constraints>
                             </view>
                             <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d13-IV-tbA">
-                                <rect key="frame" x="8" y="92" width="359" height="110"/>
+                                <rect key="frame" x="8" y="92" width="398" height="111"/>
                                 <color key="backgroundColor" red="0.94901960780000005" green="0.95294117649999999" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -987,19 +986,19 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <stackView opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="tXt-o9-X4E">
-                                <rect key="frame" x="8" y="92" width="359" height="110"/>
+                                <rect key="frame" x="8" y="92" width="398" height="111"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M1w-oi-9zg">
-                                        <rect key="frame" x="0.0" y="0.0" width="119.66666666666667" height="110"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="132.5" height="111"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="홍길동" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A72-WX-Gkz">
-                                                <rect key="frame" x="35.333333333333329" y="17" width="49.333333333333329" height="20"/>
+                                                <rect key="frame" x="41.5" y="17" width="49.5" height="20"/>
                                                 <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jGq-19-oja">
-                                                <rect key="frame" x="0.0" y="54" width="119.66666666666667" height="39"/>
+                                                <rect key="frame" x="0.0" y="55" width="132.5" height="39"/>
                                                 <attributedString key="attributedText">
                                                     <fragment content="내용">
                                                         <attributes>
@@ -1033,16 +1032,16 @@
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SOW-th-6k9">
-                                        <rect key="frame" x="119.66666666666666" y="0.0" width="119.66666666666666" height="110"/>
+                                        <rect key="frame" x="132.5" y="0.0" width="133" height="111"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A1000100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="chw-O9-PTX">
-                                                <rect key="frame" x="15.333333333333329" y="17" width="89" height="20"/>
+                                                <rect key="frame" x="22" y="17" width="89" height="20"/>
                                                 <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gHF-SU-Yfh">
-                                                <rect key="frame" x="0.0" y="54" width="119.66666666666667" height="39"/>
+                                                <rect key="frame" x="0.0" y="55" width="133" height="39"/>
                                                 <attributedString key="attributedText">
                                                     <fragment>
                                                         <string key="content">내용 텍스트 
@@ -1078,16 +1077,16 @@
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JOM-b2-uNp">
-                                        <rect key="frame" x="239.33333333333334" y="0.0" width="119.66666666666666" height="110"/>
+                                        <rect key="frame" x="265.5" y="0.0" width="132.5" height="111"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20 / M" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HE5-qb-ZSg">
-                                                <rect key="frame" x="32.666666666666657" y="17" width="54.333333333333343" height="20"/>
+                                                <rect key="frame" x="39" y="17" width="54.5" height="20"/>
                                                 <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="18"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F6E-nV-1vq">
-                                                <rect key="frame" x="0.0" y="54" width="119.66666666666667" height="39"/>
+                                                <rect key="frame" x="0.0" y="55" width="132.5" height="39"/>
                                                 <attributedString key="attributedText">
                                                     <fragment>
                                                         <string key="content">내용 텍스트 
@@ -1135,7 +1134,7 @@
                                 </userDefinedRuntimeAttributes>
                             </stackView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018-10-10 외래 or 입원, 진료과" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qrF-N9-cAv">
-                                <rect key="frame" x="16" y="217" width="343" height="20"/>
+                                <rect key="frame" x="16" y="218" width="382" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="za8-Ii-iFb"/>
                                 </constraints>
@@ -1144,10 +1143,10 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" maximumZoomScale="6" translatesAutoresizingMaskIntoConstraints="NO" id="2iH-20-RM0">
-                                <rect key="frame" x="8" y="245" width="359" height="483"/>
+                                <rect key="frame" x="8" y="246" width="398" height="566"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5Sc-ew-tv8">
-                                        <rect key="frame" x="0.0" y="0.0" width="359" height="483"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="398" height="566"/>
                                     </imageView>
                                 </subviews>
                                 <constraints>
@@ -1160,31 +1159,21 @@
                                 </constraints>
                             </scrollView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QtU-l3-lKc">
-                                <rect key="frame" x="8" y="728" width="359" height="50"/>
+                                <rect key="frame" x="8" y="812" width="398" height="50"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gSz-Ro-iIZ">
-                                        <rect key="frame" x="259" y="0.0" width="50" height="50"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="width" secondItem="gSz-Ro-iIZ" secondAttribute="height" multiplier="1:1" id="fCt-RW-SRY"/>
                                         </constraints>
-                                        <state key="normal" image="f_btn_a_upload"/>
-                                    </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kX7-lc-b7T">
-                                        <rect key="frame" x="309" y="0.0" width="50" height="50"/>
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" secondItem="kX7-lc-b7T" secondAttribute="height" multiplier="1:1" id="ZxF-yY-hkZ"/>
-                                        </constraints>
-                                        <state key="normal" image="f_btn_a_exit"/>
+                                        <color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <state key="normal" image="baseline_cloud"/>
                                     </button>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
-                                    <constraint firstItem="kX7-lc-b7T" firstAttribute="leading" secondItem="gSz-Ro-iIZ" secondAttribute="trailing" id="4Gq-aY-lgm"/>
-                                    <constraint firstItem="kX7-lc-b7T" firstAttribute="top" secondItem="QtU-l3-lKc" secondAttribute="top" id="7oi-dj-MVE"/>
-                                    <constraint firstAttribute="bottom" secondItem="kX7-lc-b7T" secondAttribute="bottom" id="PsG-Ui-p2Z"/>
-                                    <constraint firstAttribute="trailing" secondItem="kX7-lc-b7T" secondAttribute="trailing" id="Weh-EV-jnC"/>
+                                    <constraint firstItem="gSz-Ro-iIZ" firstAttribute="leading" secondItem="QtU-l3-lKc" secondAttribute="leading" id="b7N-Jk-b59"/>
                                     <constraint firstAttribute="bottom" secondItem="gSz-Ro-iIZ" secondAttribute="bottom" id="dqu-mB-GrG"/>
                                     <constraint firstItem="gSz-Ro-iIZ" firstAttribute="top" secondItem="QtU-l3-lKc" secondAttribute="top" id="rE6-Un-42y"/>
                                     <constraint firstAttribute="height" constant="50" id="wEm-kj-fvN"/>
@@ -1221,7 +1210,6 @@
                         <outlet property="closeButton" destination="par-Va-bpc" id="8Yg-jO-Cub"/>
                         <outlet property="deptNmLabel" destination="jGq-19-oja" id="hxZ-AD-m2v"/>
                         <outlet property="doctorNmLabel" destination="F6E-nV-1vq" id="BJO-27-X6s"/>
-                        <outlet property="exitButton" destination="kX7-lc-b7T" id="kJT-Nx-Aeg"/>
                         <outlet property="imageView" destination="5Sc-ew-tv8" id="k1y-Vo-fs3"/>
                         <outlet property="patientIdLabel" destination="chw-O9-PTX" id="9pv-47-Vo9"/>
                         <outlet property="patientNmLabel" destination="A72-WX-Gkz" id="9nX-We-6AO"/>
@@ -1240,11 +1228,11 @@
             <objects>
                 <viewController storyboardIdentifier="WebViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="ySz-mN-COb" customClass="WebViewController" customModule="kunkuk" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="FvJ-I3-Lal">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="i01-15-nXY" customClass="StoryBoardableWKWebView" customModule="kunkuk" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="44" width="375" height="734"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="818"/>
                             </view>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1272,20 +1260,20 @@
             <objects>
                 <viewController storyboardIdentifier="BarcodeViewController" useStoryboardIdentifierAsRestorationIdentifier="YES" id="hXX-kq-ut8" customClass="BarcodeViewController" customModule="kunkuk" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5qx-dD-4na">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oTz-vn-Un2">
-                                <rect key="frame" x="0.0" y="44" width="375" height="48"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="48"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="스캔" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tzg-sE-Hgh">
-                                        <rect key="frame" x="170.33333333333334" y="13.666666666666664" width="34.666666666666657" height="21"/>
+                                        <rect key="frame" x="189.5" y="13.5" width="35" height="21"/>
                                         <fontDescription key="fontDescription" name="NanumSquareB" family="NanumSquare" pointSize="19"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="close_x" translatesAutoresizingMaskIntoConstraints="NO" id="Dhl-af-Gnu">
-                                        <rect key="frame" x="346" y="13.666666666666664" width="21" height="21"/>
+                                        <rect key="frame" x="385" y="13.5" width="21" height="21"/>
                                         <constraints>
                                             <constraint firstAttribute="width" secondItem="Dhl-af-Gnu" secondAttribute="height" multiplier="1:1" id="2HK-aA-anq"/>
                                             <constraint firstAttribute="height" constant="21" id="n7V-E9-8FP"/>
@@ -1302,7 +1290,7 @@
                                 </constraints>
                             </view>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fY6-cx-P9K">
-                                <rect key="frame" x="0.0" y="92" width="375" height="686"/>
+                                <rect key="frame" x="0.0" y="92" width="414" height="770"/>
                             </containerView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1337,8 +1325,6 @@
         <image name="close_x" width="63" height="63"/>
         <image name="f_btn_a_camera" width="150" height="150"/>
         <image name="f_btn_a_del" width="150" height="150"/>
-        <image name="f_btn_a_exit" width="150" height="150"/>
-        <image name="f_btn_a_upload" width="150" height="150"/>
         <image name="f_btn_back" width="270" height="150"/>
         <image name="f_btn_camera" width="270" height="150"/>
         <image name="f_btn_list" width="270" height="150"/>

+ 3 - 1
MCPlus/Model/Photo.swift

@@ -216,7 +216,7 @@ extension Photo{
         returnDic = [(String,[Photo])]()
         
         if contactDB.open() {
-            let querySQL = "SELECT userId, fileName, fileKey FROM Photo ORDER BY fileDate ASC"
+            let querySQL = "SELECT userId, userName, fileName, fileKey FROM Photo ORDER BY userName ASC, fileDate ASC"
             
             let result: FMResultSet? = contactDB.executeQuery(querySQL, withArgumentsIn: [])
             // next 메서드는 일치하는 레코드가 적어도 하나 이상인지 확인하기 위함
@@ -228,6 +228,7 @@ extension Photo{
                 let _user = User()
                 photo.user = _user
                 photo.user?.patientId = result?.string(forColumn: "userId")
+                photo.user?.patientNm = result?.string(forColumn: "userName")
                 photo.file = result?.string(forColumn: "fileName")
                 photo.key = result?.string(forColumn: "fileKey")
                 
@@ -246,6 +247,7 @@ extension Photo{
         } else {
             print("Error \(contactDB.lastErrorMessage())")
         }
+        //딕셔너리 sort 문제 잇음
         return returnDic
     }
     

+ 8 - 23
MCPlus/ViewControllers/PhotoDetailViewController.swift

@@ -48,11 +48,11 @@ class PhotoDetailViewController: UIViewController {
         }
     }
     
-    @IBOutlet weak var exitButton: UIButton!{
-        didSet{
-            exitButton.addTapGestureRecognizer(action: self.closeAction)
-        }
-    }
+//    @IBOutlet weak var exitButton: UIButton!{
+//        didSet{
+//            exitButton.addTapGestureRecognizer(action: self.closeAction)
+//        }
+//    }
     
     @IBOutlet weak var uploadButton: UIButton!{
         didSet{
@@ -65,34 +65,19 @@ class PhotoDetailViewController: UIViewController {
     
     @IBOutlet weak var deptNmLabel: UILabel!{
         didSet{
-            PictureViewController.deptNm.signal.observe { [weak deptNmLabel](item) in
-                guard let value = item.value as? String else{ return }
-                let attr = deptNmLabel?.attributedText?.attributes(at: 0, effectiveRange: nil)
-                let attrString = NSMutableAttributedString(string: value, attributes: attr)
-                deptNmLabel?.attributedText = attrString
+                deptNmLabel.text = self.photo?.user?.deptNm
             }
-        }
     }
     
     @IBOutlet weak var treatClsKrLabel: UILabel!{
         didSet{
-            PictureViewController.treatClsKr.signal.observe { [weak treatClsKrLabel](item) in
-                guard let value = item.value as? String else{ return }
-                let attr = treatClsKrLabel?.attributedText?.attributes(at: 0, effectiveRange: nil)
-                let attrString = NSMutableAttributedString(string: value, attributes: attr)
-                treatClsKrLabel?.attributedText = attrString
+                treatClsKrLabel.text = self.photo?.user?.treatClsKr
             }
-        }
     }
     
     @IBOutlet weak var doctorNmLabel: UILabel!{
         didSet{
-            PictureViewController.doctorNm.signal.observe { [weak doctorNmLabel](item) in
-                guard let value = item.value as? String else{ return }
-                let attr = doctorNmLabel?.attributedText?.attributes(at: 0, effectiveRange: nil)
-                let attrString = NSMutableAttributedString(string: value, attributes: attr)
-                doctorNmLabel?.attributedText = attrString
-            }
+                doctorNmLabel.text = self.photo?.user?.doctorNm
         }
     }
     

+ 61 - 31
MCPlus/ViewControllers/PhotoViewController.swift

@@ -4,7 +4,7 @@
 //
 //  Created by Muskan on 10/4/17.
 //  Copyright © 2017 akhil. All rights reserved.
-//
+// 갤러리뷰 화면이다.
 
 import UIKit
 import Photos
@@ -31,12 +31,6 @@ class PhotoViewController: UIViewController{
         }
     }
     
-    @IBOutlet weak var cancelButton: UIButton!{
-        didSet{
-            cancelButton.addTapGestureRecognizer(action: self.cancelAction)
-        }
-    }
-    
     @IBOutlet weak var okButton: UIButton!{
         didSet{
             okButton.addTapGestureRecognizer(action: self.okAction)
@@ -331,17 +325,38 @@ extension PhotoViewController{
     func reloadTable(){
         guard let parent = self.parent as? PictureViewController else{ return }
         guard let user = parent.user else{ return }
-        if self.allUserAlbumLabel.text == "전체환자"{
+//        if self.allUserAlbumLabel.text == "전체환자"{
+//            self.list.value = Photo.list(user: user)
+//        }else{
+//            self.list.value = Photo.allList(user: user)
+//        }
+        
+//        if self.allSelectLabel.text == "전체선택"{
+//            self.allSelectCheckFlag.value = false
+//        }else{
+//            self.allSelectCheckFlag.value = true
+//        }
+        if self.allUserAlbumCheck.checked {
             self.list.value = Photo.list(user: user)
+//            self.allUserAlbumLabel.text = "전체환자"
         }else{
             self.list.value = Photo.allList(user: user)
+//            self.allUserAlbumLabel.text = "개인환자"
         }
         
-        if self.allSelectLabel.text == "전체선택"{
-            self.allSelectCheckFlag.value = false
-        }else{
-            self.allSelectCheckFlag.value = true
-        }
+//        if self.allSelectCheck.isChecked {
+//            self.allSelectCheckFlag.value = true
+//            print("전체 해제됨")
+//            
+//        } else {
+//            print("전체 선택됨")
+//        }
+        self.allSelectCheckFlag.value = false
+        
+        self.allUserAlbumCheck.checked = !self.allUserAlbumCheck.checked
+        
+        
+        
     }
     
     //커스텀 카메라 호출
@@ -358,29 +373,44 @@ extension PhotoViewController{
         //섹션카운트
         let section = self.photoCollectionView.numberOfSections
         
-        //전체선택일경우 전체선택 or 해제
-        if self.allSelectLabel.text == "전체선택"{
-            self.allSelectLabel.text = "선택해제"
-            self.allSelectCheck.isChecked = true
-            self.allSelectCheckFlag.value = true
-        }else{
-            self.allSelectLabel.text = "전체선택"
-            self.allSelectCheck.isChecked = false
-            self.allSelectCheckFlag.value = false
-        }
+//        //전체선택일경우 전체선택 or 해제
+//        if self.allSelectLabel.text == "전체선택"{
+//            self.allSelectLabel.text = "선택해제"
+//            self.allSelectCheck.isChecked = true
+//            self.allSelectCheckFlag.value = true
+//        }else{
+//            self.allSelectLabel.text = "전체선택"
+//            self.allSelectCheck.isChecked = false
+//            self.allSelectCheckFlag.value = false
+//        }
+        
+//        if self.allSelectCheck.isChecked {
+//            self.allSelectLabel.text = "선택해제"
+//        } else {
+//            self.allSelectLabel.text = "전체선택"
+//        }
+        self.allSelectCheck.isChecked = !self.allSelectCheck.isChecked
+        self.allSelectCheckFlag.value = !self.allSelectCheckFlag.value
+        
     }
     
     //전체앨범 or 선택환자
     func allUserAlbumAction(){
-        if self.allUserAlbumLabel.text == "전체환자"{
-            self.allUserAlbumLabel.text = "개인환자"
-            self.allUserAlbumCheck.isChecked = true
-            
-        }else{
-            self.allUserAlbumLabel.text = "전체환자"
-            self.allUserAlbumCheck.isChecked = false
-        }
+//        if self.allUserAlbumLabel.text == "전체환자"{
+//            self.allUserAlbumLabel.text = "개인환자"
+//            self.allUserAlbumCheck.isChecked = true
+//
+//        }else{
+//            self.allUserAlbumLabel.text = "전체환자"
+//            self.allUserAlbumCheck.isChecked = false
+//        }
         
+//        if self.allUserAlbumCheck.isChecked {
+//            self.allUserAlbumLabel.text = "개인환자"
+//        } else {
+//            self.allUserAlbumLabel.text = "전체환자"
+//        }
+//        self.allUserAlbumCheck.isChecked = !self.allUserAlbumCheck.isChecked
         self.reloadTable()
         
     }