Начало Каталог Помощ
Регистрация Вход
csx
/
XT_Admin_Api
Наблюдаван 1
Харесван 0
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Версии 0 Уики Activity
Преглед на файлове

Merge remote-tracking branch 'origin/master'

csx преди 5 години
родител
f1c12e2ed1 975c6d2a8e
ревизия
f944f30608
променени са 6 файла, в които са добавени 885 реда и са изтрити 294 реда
Разделен изглед Покажи статистика за разликите
  1. 319 276
      .idea/workspace.xml
  2. BIN
      XT_Admin_Api.exe
  3. 499 0
      controllers/function_api_controllers/function_api_base_controller.go
  4. 13 0
      controllers/function_api_controllers/function_api_router_register.go
  5. 34 2
      models/function_models/fuction_query_models.go
  6. 20 16
      service/function_service.go

+ 319 - 276
.idea/workspace.xml Целия файл 

@@ -3,13 +3,13 @@
3 3 
   <component name="ChangeListManager">
4 4 
     <list default="true" id="7aa7cc45-aece-4fa3-9063-5e3df12471b4" name="Default" comment="">
5 5 
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 
-      <change beforePath="$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go" afterDir="false" />
7 
-      <change beforePath="$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go" afterDir="false" />
8 
-      <change beforePath="$PROJECT_DIR$/controllers/admin_api_controllers/system_api_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/admin_api_controllers/system_api_controller.go" afterDir="false" />
9 
-      <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
10 
-      <change beforePath="$PROJECT_DIR$/service/admin_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/admin_service.go" afterDir="false" />
6 
+      <change beforePath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go" afterDir="false" />
7 
+      <change beforePath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" afterDir="false" />
8 
+      <change beforePath="$PROJECT_DIR$/models/function_models/fuction_query_models.go" beforeDir="false" afterPath="$PROJECT_DIR$/models/function_models/fuction_query_models.go" afterDir="false" />
9 
+      <change beforePath="$PROJECT_DIR$/service/function_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/function_service.go" afterDir="false" />
11 10 
     </list>
12 11 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 
+    <option name="TRACKING_ENABLED" value="true" />
13 13 
     <option name="SHOW_DIALOG" value="false" />
14 14 
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
15 15 
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
 
@@ -17,107 +17,80 @@
17 17 
   </component>
18 18 
   <component name="FileEditorManager">
19 19 
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 
-      <file pinned="false" current-in-tab="false">
21 
-        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go">
22 
-          <provider selected="true" editor-type-id="text-editor">
23 
-            <state relative-caret-position="200">
24 
-              <caret line="31" column="50" selection-start-line="31" selection-start-column="50" selection-end-line="31" selection-end-column="50" />
25 
-            </state>
26 
-          </provider>
27 
-        </entry>
28 
-      </file>
29 
-      <file pinned="false" current-in-tab="false">
20 
+      <file leaf-file-name="analysis_api_controller.go" pinned="false" current-in-tab="false">
30 21 
         <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
31 22 
           <provider selected="true" editor-type-id="text-editor">
32 
-            <state relative-caret-position="-612">
33 
-              <caret line="487" column="36" selection-start-line="487" selection-start-column="36" selection-end-line="487" selection-end-column="36" />
23 
+            <state relative-caret-position="437">
24 
+              <caret line="427" selection-start-line="427" selection-end-line="427" />
34 25 
             </state>
35 26 
           </provider>
36 27 
         </entry>
37 28 
       </file>
38 
-      <file pinned="false" current-in-tab="true">
39 
-        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/system_api_controller.go">
29 
+      <file leaf-file-name="function_api_router_register.go" pinned="false" current-in-tab="false">
30 
+        <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
40 31 
           <provider selected="true" editor-type-id="text-editor">
41 
-            <state relative-caret-position="192">
42 
-              <caret line="74" column="33" selection-start-line="74" selection-start-column="33" selection-end-line="74" selection-end-column="33" />
32 
+            <state relative-caret-position="388">
33 
+              <caret line="95" selection-start-line="95" selection-end-line="95" />
43 34 
               <folding>
44 
-                <element signature="e#31#211#0" expanded="true" />
35 
+                <element signature="e#34#79#0" expanded="true" />
45 36 
               </folding>
46 37 
             </state>
47 38 
           </provider>
48 39 
         </entry>
49 40 
       </file>
50 
-      <file pinned="false" current-in-tab="false">
41 
+      <file leaf-file-name="admin_service.go" pinned="false" current-in-tab="false">
51 42 
         <entry file="file://$PROJECT_DIR$/service/admin_service.go">
52 43 
           <provider selected="true" editor-type-id="text-editor">
53 
-            <state relative-caret-position="120">
54 
-              <caret line="823" column="305" selection-start-line="823" selection-start-column="305" selection-end-line="823" selection-end-column="305" />
55 
-              <folding>
56 
-                <element signature="e#35#157#0" expanded="true" />
57 
-              </folding>
58 
-            </state>
59 
-          </provider>
60 
-        </entry>
61 
-      </file>
62 
-      <file pinned="false" current-in-tab="false">
63 
-        <entry file="file:///usr/local/Cellar/go/1.10.1/libexec/src/reflect/value.go">
64 
-          <provider selected="true" editor-type-id="text-editor">
65 
-            <state relative-caret-position="135">
66 
-              <caret line="305" selection-start-line="305" selection-end-line="305" />
44 
+            <state relative-caret-position="572">
45 
+              <caret line="34" column="1" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
67 46 
             </state>
68 47 
           </provider>
69 48 
         </entry>
70 49 
       </file>
71 
-      <file pinned="false" current-in-tab="false">
72 
-        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/org_api_controller.go">
50 
+      <file leaf-file-name="function_service.go" pinned="false" current-in-tab="true">
51 
+        <entry file="file://$PROJECT_DIR$/service/function_service.go">
73 52 
           <provider selected="true" editor-type-id="text-editor">
74 
-            <state relative-caret-position="298">
75 
-              <caret line="114" column="40" selection-start-line="114" selection-start-column="40" selection-end-line="114" selection-end-column="40" />
53 
+            <state relative-caret-position="228">
54 
+              <caret line="149" column="219" selection-start-line="149" selection-start-column="219" selection-end-line="149" selection-end-column="219" />
76 55 
               <folding>
77 
-                <element signature="e#31#160#0" expanded="true" />
56 
+                <element signature="e#17#73#0" expanded="true" />
78 57 
               </folding>
79 58 
             </state>
80 59 
           </provider>
81 60 
         </entry>
82 61 
       </file>
83 
-      <file pinned="false" current-in-tab="false">
84 
-        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_base_controller.go">
62 
+      <file leaf-file-name="fuction_query_models.go" pinned="false" current-in-tab="false">
63 
+        <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
85 64 
           <provider selected="true" editor-type-id="text-editor">
86 
-            <state relative-caret-position="279">
87 
-              <caret line="50" column="41" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" />
65 
+            <state relative-caret-position="471">
66 
+              <caret line="513" column="13" selection-start-line="513" selection-start-column="13" selection-end-line="513" selection-end-column="13" />
88 67 
             </state>
89 68 
           </provider>
90 69 
         </entry>
91 70 
       </file>
92 
-      <file pinned="false" current-in-tab="false">
93 
-        <entry file="file://$PROJECT_DIR$/service/org_service.go">
71 
+      <file leaf-file-name="function_api_base_controller.go" pinned="false" current-in-tab="false">
72 
+        <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
94 73 
           <provider selected="true" editor-type-id="text-editor">
95 
-            <state relative-caret-position="-4694">
96 
-              <caret line="217" column="33" selection-start-line="217" selection-start-column="33" selection-end-line="217" selection-end-column="151" />
97 
-              <folding>
98 
-                <element signature="e#396#5796#0" />
99 
-              </folding>
74 
+            <state relative-caret-position="168">
75 
+              <caret line="3556" column="51" selection-start-line="3556" selection-start-column="35" selection-end-line="3556" selection-end-column="51" />
100 76 
             </state>
101 77 
           </provider>
102 78 
         </entry>
103 79 
       </file>
104 
-      <file pinned="false" current-in-tab="false">
80 
+      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
105 81 
         <entry file="file://$PROJECT_DIR$/conf/app.conf">
106 82 
           <provider selected="true" editor-type-id="text-editor">
107 
-            <state relative-caret-position="180">
108 
-              <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
83 
+            <state>
84 
+              <caret column="12" selection-start-column="12" selection-end-column="12" />
109 85 
             </state>
110 86 
           </provider>
111 87 
         </entry>
112 88 
       </file>
113 
-      <file pinned="false" current-in-tab="false">
89 
+      <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
114 90 
         <entry file="file://$PROJECT_DIR$/routers/router.go">
115 91 
           <provider selected="true" editor-type-id="text-editor">
116 
-            <state relative-caret-position="315">
117 
-              <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
118 
-              <folding>
119 
-                <element signature="e#17#222#0" expanded="true" />
120 
-              </folding>
92 
+            <state relative-caret-position="104">
93 
+              <caret line="12" column="80" selection-start-line="12" selection-start-column="71" selection-end-line="12" selection-end-column="80" />
121 94 
             </state>
122 95 
           </provider>
123 96 
         </entry>
 
@@ -133,10 +106,12 @@
133 106 
   </component>
134 107 
   <component name="FindInProjectRecents">
135 108 
     <findStrings>
109 
+      <find>/admin/api/patient/analysis</find>
136 110 
       <find>PatientAnalysis</find>
137 111 
       <find>AdminAPIControllersRegisterRouters</find>
138 112 
       <find>admin_api_controllers</find>
139 113 
       <find>/admin/api/home/statistics</find>
114 
+      <find>HomeStatistics</find>
140 115 
       <find>SchedualPatient</find>
141 116 
       <find>patient_count_list</find>
142 117 
       <find>aaa</find>
 
@@ -149,70 +124,47 @@
149 124 
       <find>/api/function/getBeforDislysis</find>
150 125 
       <find>GetTodayBeforDislysisInfo</find>
151 126 
       <find>GetTodayInfo</find>
152 
-      <find>admin/api/org</find>
153 
-      <find>admin/api/follow/cancel</find>
154 
-      <find>LoginByPwd</find>
155 
-      <find>/admin/api/follow/edit</find>
156 
-      <find>PostUnFollow</find>
157 
-      <find>/admin/api/user/delete</find>
158 
-      <find>ModifyFollowInfo</find>
159 
-      <find>GetOrgList</find>
160 
-      <find>GetOrgInfo</find>
161 
-      <find>GetOrgDialysisOrderStatistics</find>
162 
-      <find>HomeStatistics</find>
163 
-      <find>GetFollowOrg</find>
164 
-      <find>GetWaitFollowOrg</find>
165 
-      <find>GetAllFollowOrg</find>
166 127 
     </findStrings>
167 128 
     <dirStrings>
168 129 
       <dir>D:\goyard\src\XT_Admin_Api\controllers\admin_api_controllers</dir>
169 130 
     </dirStrings>
170 131 
   </component>
171 
-  <component name="GOROOT" path="/usr/local/Cellar/go/1.10.1/libexec" />
132 
+  <component name="GOROOT" path="C:\Go" />
172 133 
   <component name="Git.Settings">
173 134 
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
174 135 
   </component>
175 136 
   <component name="IdeDocumentHistory">
176 137 
     <option name="CHANGED_PATHS">
177 138 
       <list>
139 
+        <option value="$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go" />
140 
+        <option value="$PROJECT_DIR$/routers/router.go" />
178 141 
         <option value="$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_base_controller.go" />
142 
+        <option value="$PROJECT_DIR$/service/admin_service.go" />
143 
+        <option value="$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go" />
179 144 
         <option value="$PROJECT_DIR$/models/function_models/fuction_query_models.go" />
180 
-        <option value="$PROJECT_DIR$/service/function_service.go" />
181 145 
         <option value="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" />
182 146 
         <option value="$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go" />
183 
-        <option value="$PROJECT_DIR$/controllers/admin_api_controllers/org_api_controller.go" />
184 
-        <option value="$PROJECT_DIR$/service/db.go" />
185 
-        <option value="$PROJECT_DIR$/conf/app.conf" />
186 
-        <option value="$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go" />
187 
-        <option value="$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go" />
188 
-        <option value="$PROJECT_DIR$/routers/router.go" />
189 
-        <option value="$PROJECT_DIR$/service/admin_service.go" />
190 
-        <option value="$PROJECT_DIR$/controllers/admin_api_controllers/system_api_controller.go" />
147 
+        <option value="$PROJECT_DIR$/service/function_service.go" />
191 148 
       </list>
192 149 
     </option>
193 150 
   </component>
194 
-  <component name="ProjectFrameBounds">
195 
-    <option name="x" value="132" />
196 
-    <option name="y" value="23" />
197 
-    <option name="width" value="1440" />
198 
-    <option name="height" value="834" />
151 
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
152 
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
153 
+  <component name="JsGulpfileManager">
154 
+    <detection-done>true</detection-done>
155 
+    <sorting>DEFINITION_ORDER</sorting>
156 
+  </component>
157 
+  <component name="ProjectFrameBounds" extendedState="6">
158 
+    <option name="x" value="37" />
159 
+    <option name="y" value="53" />
160 
+    <option name="width" value="1690" />
161 
+    <option name="height" value="1040" />
199 162 
   </component>
200 163 
   <component name="ProjectView">
201 164 
     <navigator proportions="" version="1">
202 165 
       <foldersAlwaysOnTop value="true" />
203 166 
     </navigator>
204 167 
     <panes>
205 
-      <pane id="Scope">
206 
-        <subPane subId="Scope 'Project Files'; set:Project Files; class com.intellij.psi.search.scope.ProjectFilesScope">
207 
-          <expand>
208 
-            <path>
209 
-              <item name="XT_Admin_Api" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
210 
-              <item name="" type="442cc68d:ScopeViewTreeModel$RootNode" />
211 
-            </path>
212 
-          </expand>
213 
-          <select />
214 
-        </subPane>
215 
-      </pane>
216 168 
       <pane id="ProjectPane">
217 169 
         <subPane>
218 170 
           <expand>
 
@@ -225,22 +177,6 @@
225 177 
               <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
226 178 
               <item name="conf" type="462c0819:PsiDirectoryNode" />
227 179 
             </path>
228 
-            <path>
229 
-              <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
230 
-              <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
231 
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
232 
-            </path>
233 
-            <path>
234 
-              <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
235 
-              <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
236 
-              <item name="controllers" type="462c0819:PsiDirectoryNode" />
237 
-              <item name="admin_api_controllers" type="462c0819:PsiDirectoryNode" />
238 
-            </path>
239 
-            <path>
240 
-              <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
241 
-              <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
242 
-              <item name="enums" type="462c0819:PsiDirectoryNode" />
243 
-            </path>
244 180 
             <path>
245 181 
               <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
246 182 
               <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
 
@@ -250,63 +186,30 @@
250 186 
               <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
251 187 
               <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
252 188 
               <item name="models" type="462c0819:PsiDirectoryNode" />
253 
-              <item name="admin_models" type="462c0819:PsiDirectoryNode" />
189 
+              <item name="function_models" type="462c0819:PsiDirectoryNode" />
254 190 
             </path>
255 191 
             <path>
256 192 
               <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
257 193 
               <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
258 
-              <item name="models" type="462c0819:PsiDirectoryNode" />
259 
-              <item name="function_models" type="462c0819:PsiDirectoryNode" />
194 
+              <item name="routers" type="462c0819:PsiDirectoryNode" />
260 195 
             </path>
261 196 
             <path>
262 197 
               <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
263 198 
               <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
264 199 
               <item name="service" type="462c0819:PsiDirectoryNode" />
265 200 
             </path>
266 
-            <path>
267 
-              <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
268 
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
269 
-            </path>
270 
-            <path>
271 
-              <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
272 
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
273 
-              <item name="Go SDK 1.10.1" type="20ee2d1f:SyntheticLibraryElementNode" />
274 
-            </path>
275 
-            <path>
276 
-              <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
277 
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
278 
-              <item name="Go SDK 1.10.1" type="20ee2d1f:SyntheticLibraryElementNode" />
279 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
280 
-            </path>
281 
-            <path>
282 
-              <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
283 
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
284 
-              <item name="Go SDK 1.10.1" type="20ee2d1f:SyntheticLibraryElementNode" />
285 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
286 
-              <item name="database" type="462c0819:PsiDirectoryNode" />
287 
-            </path>
288 
-            <path>
289 
-              <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
290 
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
291 
-              <item name="Go SDK 1.10.1" type="20ee2d1f:SyntheticLibraryElementNode" />
292 
-              <item name="src" type="462c0819:PsiDirectoryNode" />
293 
-              <item name="database" type="462c0819:PsiDirectoryNode" />
294 
-              <item name="sql" type="462c0819:PsiDirectoryNode" />
295 
-            </path>
296 201 
           </expand>
297 202 
           <select />
298 203 
         </subPane>
299 204 
       </pane>
205 
+      <pane id="Scope" />
300 206 
     </panes>
301 207 
   </component>
302 208 
   <component name="PropertiesComponent">
303 209 
     <property name="DefaultGoTemplateProperty" value="Go Application" />
304 
-    <property name="GO_FMT" value="true" />
305 
-    <property name="WebServerToolWindowFactoryState" value="false" />
306 210 
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
307 211 
     <property name="go.sdk.automatically.set" value="true" />
308 
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
309 
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
212 
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../SCRM" />
310 213 
   </component>
311 214 
   <component name="RunDashboard">
312 215 
     <option name="ruleStates">
 
@@ -320,269 +223,409 @@
320 223 
       </list>
321 224 
     </option>
322 225 
   </component>
323 
-  <component name="SvnConfiguration">
324 
-    <configuration />
325 
-  </component>
326 226 
   <component name="ToolWindowManager">
327 
-    <frame x="132" y="23" width="1440" height="834" extended-state="0" />
328 
-    <editor active="true" />
227 
+    <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
329 228 
     <layout>
330 
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23104435" />
229 
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20442359" />
230 
+      <window_info anchor="bottom" id="TODO" order="6" />
231 
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.102546915" side_tool="true" visible="true" weight="0.47075605" />
232 
+      <window_info anchor="right" id="Database" order="3" />
233 
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
234 
+      <window_info anchor="bottom" id="Version Control" order="9" />
235 
+      <window_info anchor="bottom" id="Run" order="2" />
331 236 
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
237 
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.89745307" visible="true" weight="0.47075605" />
332 238 
       <window_info id="Favorites" order="2" side_tool="true" />
333 
-      <window_info anchor="bottom" id="Message" order="0" />
334 
-      <window_info anchor="bottom" id="Find" order="1" />
335 
-      <window_info anchor="bottom" id="Run" order="2" />
336 239 
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
337 
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
240 
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
338 241 
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
339 
-      <window_info anchor="bottom" id="TODO" order="6" />
340 
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.10658083" side_tool="true" weight="0.29380053" />
341 
-      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
342 
-      <window_info anchor="bottom" id="Version Control" order="9" />
343 
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.89341915" visible="true" weight="0.29380053" />
344 
-      <window_info anchor="bottom" id="Docker" order="11" show_stripe_button="false" />
345 242 
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
346 243 
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
347 
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
348 
-      <window_info anchor="right" id="Database" order="3" />
244 
+      <window_info anchor="bottom" id="Message" order="0" />
245 
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
246 
+      <window_info anchor="bottom" id="Find" order="1" />
349 247 
     </layout>
350 248 
   </component>
351 249 
   <component name="TypeScriptGeneratedFilesManager">
352 250 
     <option name="version" value="1" />
353 251 
   </component>
354 
-  <component name="VcsManagerConfiguration">
355 
-    <MESSAGE value="机构功能相关接口" />
356 
-    <option name="LAST_COMMIT_MESSAGE" value="机构功能相关接口" />
252 
+  <component name="VcsContentAnnotationSettings">
253 
+    <option name="myLimit" value="2678400000" />
254 
+  </component>
255 
+  <component name="XDebuggerManager">
256 
+    <breakpoint-manager>
257 
+      <option name="time" value="1" />
258 
+    </breakpoint-manager>
357 259 
   </component>
358 260 
   <component name="editorHistoryManager">
359 
-    <entry file="file://$PROJECT_DIR$/../XT/service/admin_service.go">
261 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
360 262 
       <provider selected="true" editor-type-id="text-editor">
361 
-        <state relative-caret-position="427">
362 
-          <caret line="192" column="5" selection-start-line="192" selection-start-column="5" selection-end-line="192" selection-end-column="5" />
263 
+        <state relative-caret-position="65296">
264 
+          <caret line="2975" column="6" selection-start-line="2975" selection-start-column="6" selection-end-line="2975" selection-end-column="6" />
363 265 
         </state>
364 266 
       </provider>
365 267 
     </entry>
366 
-    <entry file="file://$PROJECT_DIR$/../XT/controllers/admin_api_controllers/analysis_api_controller.go">
268 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
367 269 
       <provider selected="true" editor-type-id="text-editor">
368 
-        <state relative-caret-position="233">
369 
-          <caret line="383" column="80" selection-start-line="383" selection-start-column="50" selection-end-line="383" selection-end-column="80" />
270 
+        <state relative-caret-position="9240">
271 
+          <caret line="427" selection-start-line="427" selection-end-line="427" />
370 272 
         </state>
371 273 
       </provider>
372 274 
     </entry>
373 
-    <entry file="file://$PROJECT_DIR$/../XT/controllers/admin_api_controllers/admin_api_router_register.go">
275 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
374 276 
       <provider selected="true" editor-type-id="text-editor">
375 
-        <state relative-caret-position="261">
376 
-          <caret line="14" column="70" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="70" />
277 
+        <state relative-caret-position="1650">
278 
+          <caret line="78" column="81" selection-start-line="78" selection-start-column="56" selection-end-line="78" selection-end-column="81" />
279 
+          <folding>
280 
+            <element signature="e#34#79#0" expanded="true" />
281 
+          </folding>
377 282 
         </state>
378 283 
       </provider>
379 284 
     </entry>
380 
-    <entry file="file://$PROJECT_DIR$/service/verify_login_token_service.go">
285 
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
381 286 
       <provider selected="true" editor-type-id="text-editor">
382 
-        <state relative-caret-position="132">
383 
-          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
287 
+        <state relative-caret-position="11176">
288 
+          <caret line="508" column="40" selection-start-line="508" selection-start-column="12" selection-end-line="508" selection-end-column="40" />
384 289 
         </state>
385 290 
       </provider>
386 291 
     </entry>
387 
-    <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
292 
+    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
388 293 
       <provider selected="true" editor-type-id="text-editor">
389 
-        <state relative-caret-position="162">
390 
-          <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
294 
+        <state relative-caret-position="10274">
295 
+          <caret line="473" column="124" selection-start-line="473" selection-start-column="124" selection-end-line="473" selection-end-column="124" />
391 296 
         </state>
392 297 
       </provider>
393 298 
     </entry>
394 
-    <entry file="file://$PROJECT_DIR$/../SCRM/models/site_models.go" />
395 
-    <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
299 
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
396 300 
       <provider selected="true" editor-type-id="text-editor">
397 
-        <state relative-caret-position="198">
398 
-          <caret line="20" column="2" lean-forward="true" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
301 
+        <state>
302 
+          <caret column="12" selection-start-column="12" selection-end-column="12" />
399 303 
         </state>
400 304 
       </provider>
401 305 
     </entry>
402 
-    <entry file="file://$PROJECT_DIR$/models/admin_models/admin_models.go">
306 
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
403 307 
       <provider selected="true" editor-type-id="text-editor">
404 
-        <state relative-caret-position="330">
405 
-          <caret line="15" column="21" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="21" />
308 
+        <state relative-caret-position="1628">
309 
+          <caret line="76" column="124" selection-start-line="76" selection-start-column="124" selection-end-line="76" selection-end-column="124" />
406 310 
         </state>
407 311 
       </provider>
408 312 
     </entry>
409 
-    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
313 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
410 314 
       <provider selected="true" editor-type-id="text-editor">
411 
-        <state relative-caret-position="329">
412 
-          <caret line="531" column="36" selection-start-line="531" selection-start-column="36" selection-end-line="531" selection-end-column="36" />
315 
+        <state relative-caret-position="41338">
316 
+          <caret line="1886" column="62" selection-start-line="1886" selection-start-column="39" selection-end-line="1886" selection-end-column="62" />
413 317 
         </state>
414 318 
       </provider>
415 319 
     </entry>
416 
-    <entry file="file://$PROJECT_DIR$/service/function_service.go">
320 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
417 321 
       <provider selected="true" editor-type-id="text-editor">
418 
-        <state relative-caret-position="-528">
419 
-          <caret line="15" column="8" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
322 
+        <state relative-caret-position="11110">
323 
+          <caret line="512" column="28" selection-start-line="512" selection-start-column="8" selection-end-line="512" selection-end-column="28" />
324 
+        </state>
325 
+      </provider>
326 
+    </entry>
327 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
328 
+      <provider selected="true" editor-type-id="text-editor">
329 
+        <state relative-caret-position="1166">
330 
+          <caret line="53" column="83" selection-start-line="53" selection-start-column="58" selection-end-line="53" selection-end-column="83" />
420 331 
           <folding>
421 
-            <element signature="e#17#66#0" expanded="true" />
332 
+            <element signature="e#34#79#0" expanded="true" />
422 333 
           </folding>
423 334 
         </state>
424 335 
       </provider>
425 336 
     </entry>
337 
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
338 
+      <provider selected="true" editor-type-id="text-editor">
339 
+        <state relative-caret-position="1122">
340 
+          <caret line="53" column="19" selection-start-line="53" selection-start-column="11" selection-end-line="53" selection-end-column="19" />
341 
+        </state>
342 
+      </provider>
343 
+    </entry>
344 
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
345 
+      <provider selected="true" editor-type-id="text-editor">
346 
+        <state relative-caret-position="7832">
347 
+          <caret line="356" column="29" selection-start-line="356" selection-start-column="12" selection-end-line="356" selection-end-column="29" />
348 
+        </state>
349 
+      </provider>
350 
+    </entry>
351 
+    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
352 
+      <provider selected="true" editor-type-id="text-editor">
353 
+        <state relative-caret-position="10406">
354 
+          <caret line="473" column="124" selection-start-line="473" selection-start-column="124" selection-end-line="473" selection-end-column="124" />
355 
+        </state>
356 
+      </provider>
357 
+    </entry>
358 
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
359 
+      <provider selected="true" editor-type-id="text-editor">
360 
+        <state>
361 
+          <caret column="12" selection-start-column="12" selection-end-column="12" />
362 
+        </state>
363 
+      </provider>
364 
+    </entry>
365 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
366 
+      <provider selected="true" editor-type-id="text-editor">
367 
+        <state relative-caret-position="4158">
368 
+          <caret line="189" column="48" selection-start-line="189" selection-start-column="36" selection-end-line="189" selection-end-column="48" />
369 
+        </state>
370 
+      </provider>
371 
+    </entry>
372 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
373 
+      <provider selected="true" editor-type-id="text-editor">
374 
+        <state relative-caret-position="11264">
375 
+          <caret line="512" column="28" selection-start-line="512" selection-start-column="8" selection-end-line="512" selection-end-column="28" />
376 
+        </state>
377 
+      </provider>
378 
+    </entry>
426 379 
     <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
427 380 
       <provider selected="true" editor-type-id="text-editor">
428 
-        <state relative-caret-position="207">
429 
-          <caret line="80" column="81" selection-start-line="80" selection-start-column="56" selection-end-line="80" selection-end-column="81" />
381 
+        <state relative-caret-position="88">
382 
+          <caret line="4" column="9" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
430 383 
           <folding>
431 384 
             <element signature="e#34#79#0" expanded="true" />
432 385 
           </folding>
433 386 
         </state>
434 387 
       </provider>
435 388 
     </entry>
389 
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
390 
+      <provider selected="true" editor-type-id="text-editor">
391 
+        <state relative-caret-position="330">
392 
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
393 
+        </state>
394 
+      </provider>
395 
+    </entry>
396 
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
397 
+      <provider selected="true" editor-type-id="text-editor">
398 
+        <state relative-caret-position="1650">
399 
+          <caret line="75" column="23" selection-start-line="75" selection-start-column="12" selection-end-line="75" selection-end-column="23" />
400 
+        </state>
401 
+      </provider>
402 
+    </entry>
403 
+    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
404 
+      <provider selected="true" editor-type-id="text-editor">
405 
+        <state relative-caret-position="10274">
406 
+          <caret line="473" column="124" selection-start-line="473" selection-start-column="67" selection-end-line="473" selection-end-column="124" />
407 
+        </state>
408 
+      </provider>
409 
+    </entry>
410 
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
411 
+      <provider selected="true" editor-type-id="text-editor">
412 
+        <state>
413 
+          <caret column="12" selection-start-column="12" selection-end-column="12" />
414 
+        </state>
415 
+      </provider>
416 
+    </entry>
436 417 
     <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
437 418 
       <provider selected="true" editor-type-id="text-editor">
438 
-        <state relative-caret-position="1298">
439 
-          <caret line="3065" column="22" selection-start-line="3065" selection-start-column="22" selection-end-line="3065" selection-end-column="22" />
419 
+        <state relative-caret-position="286">
420 
+          <caret line="13" column="38" selection-start-line="13" selection-start-column="38" selection-end-line="13" selection-end-column="38" />
440 421 
         </state>
441 422 
       </provider>
442 423 
     </entry>
443 
-    <entry file="file://$PROJECT_DIR$/models/data_models.go">
444 
-      <provider selected="true" editor-type-id="text-editor" />
424 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
425 
+      <provider selected="true" editor-type-id="text-editor">
426 
+        <state relative-caret-position="132">
427 
+          <caret line="9" column="72" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="72" />
428 
+        </state>
429 
+      </provider>
445 430 
     </entry>
446 
-    <entry file="file://$PROJECT_DIR$/models/dialysis.go">
431 
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
447 432 
       <provider selected="true" editor-type-id="text-editor">
448 
-        <state relative-caret-position="220">
449 
-          <caret line="73" column="6" selection-start-line="73" selection-start-column="6" selection-end-line="73" selection-end-column="6" />
433 
+        <state>
434 
+          <caret column="23" selection-start-column="8" selection-end-column="23" />
450 435 
         </state>
451 436 
       </provider>
452 437 
     </entry>
453 
-    <entry file="file://$PROJECT_DIR$/models/patient_models.go">
438 
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
454 439 
       <provider selected="true" editor-type-id="text-editor">
455 
-        <state relative-caret-position="30">
456 
-          <caret line="2" column="5" selection-start-line="2" selection-start-column="5" selection-end-line="2" selection-end-column="5" />
440 
+        <state relative-caret-position="242">
441 
+          <caret line="11" column="8" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
457 442 
         </state>
458 443 
       </provider>
459 444 
     </entry>
460 
-    <entry file="file://$PROJECT_DIR$/models/org_models.go">
445 
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
461 446 
       <provider selected="true" editor-type-id="text-editor">
462 
-        <state relative-caret-position="105">
463 
-          <caret line="7" column="80" selection-start-line="5" selection-start-column="4" selection-end-line="7" selection-end-column="80" />
447 
+        <state>
448 
+          <caret column="12" selection-start-column="12" selection-end-column="12" />
464 449 
         </state>
465 450 
       </provider>
466 451 
     </entry>
467 
-    <entry file="file://$PROJECT_DIR$/main.go">
452 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
468 453 
       <provider selected="true" editor-type-id="text-editor">
469 
-        <state relative-caret-position="75">
470 
-          <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
454 
+        <state relative-caret-position="418">
455 
+          <caret line="24" column="17" selection-start-line="24" selection-start-column="9" selection-end-line="24" selection-end-column="17" />
471 456 
         </state>
472 457 
       </provider>
473 458 
     </entry>
474 
-    <entry file="file://$PROJECT_DIR$/service/db.go">
459 
+    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
475 460 
       <provider selected="true" editor-type-id="text-editor">
476 
-        <state relative-caret-position="1261">
477 
-          <caret line="98" selection-start-line="98" selection-end-line="98" />
461 
+        <state relative-caret-position="10868">
462 
+          <caret line="500" column="16" selection-start-line="500" selection-start-column="10" selection-end-line="500" selection-end-column="16" />
478 463 
         </state>
479 464 
       </provider>
480 465 
     </entry>
481 
-    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/login_api_controller.go">
466 
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
482 467 
       <provider selected="true" editor-type-id="text-editor">
483 
-        <state relative-caret-position="225">
484 
-          <caret line="18" column="42" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="42" />
468 
+        <state relative-caret-position="154">
469 
+          <caret line="7" column="23" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
485 470 
         </state>
486 471 
       </provider>
487 472 
     </entry>
488 
-    <entry file="file://$PROJECT_DIR$/models/service_models.go">
489 
-      <provider selected="true" editor-type-id="text-editor" />
473 
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
474 
+      <provider selected="true" editor-type-id="text-editor">
475 
+        <state relative-caret-position="154">
476 
+          <caret line="7" selection-start-line="7" selection-end-line="7" />
477 
+        </state>
478 
+      </provider>
479 
+    </entry>
480 
+    <entry file="file://$PROJECT_DIR$/../SCRM/models/site_models.go">
481 
+      <provider selected="true" editor-type-id="text-editor">
482 
+        <state relative-caret-position="418">
483 
+          <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
484 
+        </state>
485 
+      </provider>
486 
+    </entry>
487 
+    <entry file="file://$PROJECT_DIR$/../XT/service/admin_service.go">
488 
+      <provider selected="true" editor-type-id="text-editor">
489 
+        <state relative-caret-position="427">
490 
+          <caret line="192" column="5" selection-start-line="192" selection-start-column="5" selection-end-line="192" selection-end-column="5" />
491 
+        </state>
492 
+      </provider>
493 
+    </entry>
494 
+    <entry file="file://$PROJECT_DIR$/../XT/controllers/admin_api_controllers/analysis_api_controller.go">
495 
+      <provider selected="true" editor-type-id="text-editor">
496 
+        <state relative-caret-position="233">
497 
+          <caret line="383" column="80" selection-start-line="383" selection-start-column="50" selection-end-line="383" selection-end-column="80" />
498 
+        </state>
499 
+      </provider>
490 500 
     </entry>
491 
-    <entry file="file://$PROJECT_DIR$/../github.com/astaxie/beego/router.go">
501 
+    <entry file="file://$PROJECT_DIR$/../XT/controllers/admin_api_controllers/admin_api_router_register.go">
492 502 
       <provider selected="true" editor-type-id="text-editor">
493 
-        <state relative-caret-position="662">
494 
-          <caret line="851" selection-start-line="851" selection-end-line="851" />
503 
+        <state relative-caret-position="261">
504 
+          <caret line="14" column="70" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="70" />
495 505 
         </state>
496 506 
       </provider>
497 507 
     </entry>
498 
-    <entry file="file://$PROJECT_DIR$/../github.com/jinzhu/gorm/main.go">
508 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go">
499 509 
       <provider selected="true" editor-type-id="text-editor">
500 510 
         <state relative-caret-position="308">
501 
-          <caret line="347" column="24" selection-start-line="347" selection-start-column="24" selection-end-line="347" selection-end-column="24" />
511 
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
502 512 
         </state>
503 513 
       </provider>
504 514 
     </entry>
505 
-    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_base_controller.go">
515 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/login_api_controller.go">
506 516 
       <provider selected="true" editor-type-id="text-editor">
507 
-        <state relative-caret-position="279">
508 
-          <caret line="50" column="41" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" />
517 
+        <state relative-caret-position="110">
518 
+          <caret line="9" column="26" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="26" />
509 519 
         </state>
510 520 
       </provider>
511 521 
     </entry>
512 
-    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/org_api_controller.go">
522 
+    <entry file="file://$PROJECT_DIR$/service/verify_login_token_service.go">
513 523 
       <provider selected="true" editor-type-id="text-editor">
514 
-        <state relative-caret-position="298">
515 
-          <caret line="114" column="40" selection-start-line="114" selection-start-column="40" selection-end-line="114" selection-end-column="40" />
516 
-          <folding>
517 
-            <element signature="e#31#160#0" expanded="true" />
518 
-          </folding>
524 
+        <state relative-caret-position="132">
525 
+          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
519 526 
         </state>
520 527 
       </provider>
521 528 
     </entry>
522 
-    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
529 
+    <entry file="file://$PROJECT_DIR$/controllers/base_controller.go">
523 530 
       <provider selected="true" editor-type-id="text-editor">
524 
-        <state relative-caret-position="-612">
525 
-          <caret line="487" column="36" selection-start-line="487" selection-start-column="36" selection-end-line="487" selection-end-column="36" />
531 
+        <state relative-caret-position="162">
532 
+          <caret line="13" column="28" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
526 533 
         </state>
527 534 
       </provider>
528 535 
     </entry>
529 
-    <entry file="file://$PROJECT_DIR$/service/org_service.go">
536 
+    <entry file="file://$PROJECT_DIR$/../SCRM/models/site_models.go">
530 537 
       <provider selected="true" editor-type-id="text-editor">
531 
-        <state relative-caret-position="-4694">
532 
-          <caret line="217" column="33" selection-start-line="217" selection-start-column="33" selection-end-line="217" selection-end-column="151" />
533 
-          <folding>
534 
-            <element signature="e#396#5796#0" />
535 
-          </folding>
538 
+        <state relative-caret-position="-506">
539 
+          <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
536 540 
         </state>
537 541 
       </provider>
538 542 
     </entry>
539 
-    <entry file="file://$PROJECT_DIR$/conf/app.conf">
543 
+    <entry file="file://$PROJECT_DIR$/models/dialysis.go">
544 
+      <provider selected="true" editor-type-id="text-editor">
545 
+        <state relative-caret-position="220">
546 
+          <caret line="73" column="6" selection-start-line="73" selection-start-column="6" selection-end-line="73" selection-end-column="6" />
547 
+        </state>
548 
+      </provider>
549 
+    </entry>
550 
+    <entry file="file://$PROJECT_DIR$/controllers/base_api_controller.go">
551 
+      <provider selected="true" editor-type-id="text-editor">
552 
+        <state relative-caret-position="198">
553 
+          <caret line="20" column="2" lean-forward="true" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
554 
+        </state>
555 
+      </provider>
556 
+    </entry>
557 
+    <entry file="file://$PROJECT_DIR$/models/admin_models/admin_models.go">
558 
+      <provider selected="true" editor-type-id="text-editor">
559 
+        <state relative-caret-position="330">
560 
+          <caret line="15" column="21" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="21" />
561 
+        </state>
562 
+      </provider>
563 
+    </entry>
564 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_base_controller.go">
540 565 
       <provider selected="true" editor-type-id="text-editor">
541 
-        <state relative-caret-position="180">
542 
-          <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
566 
+        <state relative-caret-position="968">
567 
+          <caret line="50" column="41" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" />
543 568 
         </state>
544 569 
       </provider>
545 570 
     </entry>
546 571 
     <entry file="file://$PROJECT_DIR$/routers/router.go">
547 572 
       <provider selected="true" editor-type-id="text-editor">
548 
-        <state relative-caret-position="315">
549 
-          <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
550 
-          <folding>
551 
-            <element signature="e#17#222#0" expanded="true" />
552 
-          </folding>
573 
+        <state relative-caret-position="104">
574 
+          <caret line="12" column="80" selection-start-line="12" selection-start-column="71" selection-end-line="12" selection-end-column="80" />
553 575 
         </state>
554 576 
       </provider>
555 577 
     </entry>
556 
-    <entry file="file:///usr/local/Cellar/go/1.10.1/libexec/src/reflect/value.go">
578 
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
557 579 
       <provider selected="true" editor-type-id="text-editor">
558 
-        <state relative-caret-position="135">
559 
-          <caret line="305" selection-start-line="305" selection-end-line="305" />
580 
+        <state relative-caret-position="437">
581 
+          <caret line="427" selection-start-line="427" selection-end-line="427" />
560 582 
         </state>
561 583 
       </provider>
562 584 
     </entry>
563 
-    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
585 
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
564 586 
       <provider selected="true" editor-type-id="text-editor">
565 
-        <state relative-caret-position="120">
566 
-          <caret line="823" column="305" selection-start-line="823" selection-start-column="305" selection-end-line="823" selection-end-column="305" />
587 
+        <state>
588 
+          <caret column="12" selection-start-column="12" selection-end-column="12" />
589 
+        </state>
590 
+      </provider>
591 
+    </entry>
592 
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
593 
+      <provider selected="true" editor-type-id="text-editor">
594 
+        <state relative-caret-position="471">
595 
+          <caret line="513" column="13" selection-start-line="513" selection-start-column="13" selection-end-line="513" selection-end-column="13" />
596 
+        </state>
597 
+      </provider>
598 
+    </entry>
599 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
600 
+      <provider selected="true" editor-type-id="text-editor">
601 
+        <state relative-caret-position="388">
602 
+          <caret line="95" selection-start-line="95" selection-end-line="95" />
567 603 
           <folding>
568 
-            <element signature="e#35#157#0" expanded="true" />
604 
+            <element signature="e#34#79#0" expanded="true" />
569 605 
           </folding>
570 606 
         </state>
571 607 
       </provider>
572 608 
     </entry>
573 
-    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_router_register.go">
609 
+    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
610 
+      <provider selected="true" editor-type-id="text-editor">
611 
+        <state relative-caret-position="572">
612 
+          <caret line="34" column="1" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
613 
+        </state>
614 
+      </provider>
615 
+    </entry>
616 
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
574 617 
       <provider selected="true" editor-type-id="text-editor">
575 
-        <state relative-caret-position="200">
576 
-          <caret line="31" column="50" selection-start-line="31" selection-start-column="50" selection-end-line="31" selection-end-column="50" />
618 
+        <state relative-caret-position="168">
619 
+          <caret line="3556" column="51" selection-start-line="3556" selection-start-column="35" selection-end-line="3556" selection-end-column="51" />
577 620 
         </state>
578 621 
       </provider>
579 622 
     </entry>
580 
-    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/system_api_controller.go">
623 
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
581 624 
       <provider selected="true" editor-type-id="text-editor">
582 
-        <state relative-caret-position="192">
583 
-          <caret line="74" column="33" selection-start-line="74" selection-start-column="33" selection-end-line="74" selection-end-column="33" />
625 
+        <state relative-caret-position="228">
626 
+          <caret line="149" column="219" selection-start-line="149" selection-start-column="219" selection-end-line="149" selection-end-column="219" />
584 627 
           <folding>
585 
-            <element signature="e#31#211#0" expanded="true" />
628 
+            <element signature="e#17#73#0" expanded="true" />
586 629 
           </folding>
587 630 
         </state>
588 631 
       </provider>

BIN
XT_Admin_Api.exe Целия файл


+ 499 - 0
controllers/function_api_controllers/function_api_base_controller.go Целия файл 

@@ -3065,4 +3065,503 @@ func  (this *FunctionBaseAPIController) GetYesterdayEntrylist()  {
3065 3065 
 		"userorg":userorg,
3066 3066 
 		"total":total,
3067 3067 
 	})
3068 
+}
3069 
+
3070 
+func (this *FunctionBaseAPIController) GetWeekEntrylist()  {
3071 
+	range_data := this.GetString("range_data")
3072 
+	fmt.Println("本日出库单",range_data)
3073 
+	page, _ := this.GetInt64("page", 1)
3074 
+	fmt.Println("页面",page)
3075 
+	limit, _ := this.GetInt64("limit", 10)
3076 
+	fmt.Println("limit",limit)
3077 
+	if page <= 0 {
3078 
+		page = 1
3079 
+	}
3080 
+	if limit <= 0 {
3081 
+		limit = 10
3082 
+	}
3083 
+	var rangeDate *time.Time
3084 
+	var parseDateErr error
3085 
+	var rangeTimeStamp int64
3086 
+
3087 
+	if len(range_data) > 0 {
3088 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3089 
+		if parseDateErr != nil {
3090 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3091 
+			return
3092 
+		}
3093 
+		rangeTimeStamp = rangeDate.Unix()
3094 
+	} else {
3095 
+		rangeTimeStamp = 0
3096 
+	}
3097 
+	now := time.Now().Unix()
3098 
+	userorg, total, err := service.GetTodayEntrylist(rangeTimeStamp, now, limit, page)
3099 
+	//3代表血透,2//退出登录状态
3100 
+	//userorgs, err := service.GetTodayLogout(0, 2)
3101 
+	//fmt.Scan("userorgs是什么",userorgs)
3102 
+	fmt.Println("userorg是什么",userorg)
3103 
+	fmt.Println("err",err)
3104 
+	fmt.Println("total是什么",total)
3105 
+	if err !=nil{
3106 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3107 
+		return
3108 
+	}
3109 
+	this.ServeSuccessJSON(map[string]interface{}{
3110 
+		"userorg":userorg,
3111 
+		"total":total,
3112 
+	})
3113 
+}
3114 
+
3115 
+func (this *FunctionBaseAPIController) GetMonthEntrylist()  {
3116 
+	range_data := this.GetString("range_data")
3117 
+	fmt.Println("本日出库单",range_data)
3118 
+	page, _ := this.GetInt64("page", 1)
3119 
+	fmt.Println("页面",page)
3120 
+	limit, _ := this.GetInt64("limit", 10)
3121 
+	fmt.Println("limit",limit)
3122 
+	if page <= 0 {
3123 
+		page = 1
3124 
+	}
3125 
+	if limit <= 0 {
3126 
+		limit = 10
3127 
+	}
3128 
+	var rangeDate *time.Time
3129 
+	var parseDateErr error
3130 
+	var rangeTimeStamp int64
3131 
+
3132 
+	if len(range_data) > 0 {
3133 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3134 
+		if parseDateErr != nil {
3135 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3136 
+			return
3137 
+		}
3138 
+		rangeTimeStamp = rangeDate.Unix()
3139 
+	} else {
3140 
+		rangeTimeStamp = 0
3141 
+	}
3142 
+	now := time.Now().Unix()
3143 
+	userorg, total, err := service.GetTodayEntrylist(rangeTimeStamp, now, limit, page)
3144 
+	//3代表血透,2//退出登录状态
3145 
+	//userorgs, err := service.GetTodayLogout(0, 2)
3146 
+	//fmt.Scan("userorgs是什么",userorgs)
3147 
+	fmt.Println("userorg是什么",userorg)
3148 
+	fmt.Println("err",err)
3149 
+	fmt.Println("total是什么",total)
3150 
+	if err !=nil{
3151 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3152 
+		return
3153 
+	}
3154 
+	this.ServeSuccessJSON(map[string]interface{}{
3155 
+		"userorg":userorg,
3156 
+		"total":total,
3157 
+	})
3158 
+}
3159 
+
3160 
+func (this *FunctionBaseAPIController) GetThreeMonthEntrylist()  {
3161 
+	range_data := this.GetString("range_data")
3162 
+	fmt.Println("本日出库单",range_data)
3163 
+	page, _ := this.GetInt64("page", 1)
3164 
+	fmt.Println("页面",page)
3165 
+	limit, _ := this.GetInt64("limit", 10)
3166 
+	fmt.Println("limit",limit)
3167 
+	if page <= 0 {
3168 
+		page = 1
3169 
+	}
3170 
+	if limit <= 0 {
3171 
+		limit = 10
3172 
+	}
3173 
+	var rangeDate *time.Time
3174 
+	var parseDateErr error
3175 
+	var rangeTimeStamp int64
3176 
+
3177 
+	if len(range_data) > 0 {
3178 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3179 
+		if parseDateErr != nil {
3180 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3181 
+			return
3182 
+		}
3183 
+		rangeTimeStamp = rangeDate.Unix()
3184 
+	} else {
3185 
+		rangeTimeStamp = 0
3186 
+	}
3187 
+	now := time.Now().Unix()
3188 
+	userorg, total, err := service.GetTodayEntrylist(rangeTimeStamp, now, limit, page)
3189 
+	//3代表血透,2//退出登录状态
3190 
+	//userorgs, err := service.GetTodayLogout(0, 2)
3191 
+	//fmt.Scan("userorgs是什么",userorgs)
3192 
+	fmt.Println("userorg是什么",userorg)
3193 
+	fmt.Println("err",err)
3194 
+	fmt.Println("total是什么",total)
3195 
+	if err !=nil{
3196 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3197 
+		return
3198 
+	}
3199 
+	this.ServeSuccessJSON(map[string]interface{}{
3200 
+		"userorg":userorg,
3201 
+		"total":total,
3202 
+	})
3203 
+}
3204 
+
3205 
+func (this *FunctionBaseAPIController)  GetHalfYearEntrylist()  {
3206 
+	range_data := this.GetString("range_data")
3207 
+	fmt.Println("本日出库单",range_data)
3208 
+	page, _ := this.GetInt64("page", 1)
3209 
+	fmt.Println("页面",page)
3210 
+	limit, _ := this.GetInt64("limit", 10)
3211 
+	fmt.Println("limit",limit)
3212 
+	if page <= 0 {
3213 
+		page = 1
3214 
+	}
3215 
+	if limit <= 0 {
3216 
+		limit = 10
3217 
+	}
3218 
+	var rangeDate *time.Time
3219 
+	var parseDateErr error
3220 
+	var rangeTimeStamp int64
3221 
+
3222 
+	if len(range_data) > 0 {
3223 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3224 
+		if parseDateErr != nil {
3225 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3226 
+			return
3227 
+		}
3228 
+		rangeTimeStamp = rangeDate.Unix()
3229 
+	} else {
3230 
+		rangeTimeStamp = 0
3231 
+	}
3232 
+	now := time.Now().Unix()
3233 
+	userorg, total, err := service.GetTodayEntrylist(rangeTimeStamp, now, limit, page)
3234 
+	//3代表血透,2//退出登录状态
3235 
+	//userorgs, err := service.GetTodayLogout(0, 2)
3236 
+	//fmt.Scan("userorgs是什么",userorgs)
3237 
+	fmt.Println("userorg是什么",userorg)
3238 
+	fmt.Println("err",err)
3239 
+	fmt.Println("total是什么",total)
3240 
+	if err !=nil{
3241 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3242 
+		return
3243 
+	}
3244 
+	this.ServeSuccessJSON(map[string]interface{}{
3245 
+		"userorg":userorg,
3246 
+		"total":total,
3247 
+	})
3248 
+}
3249 
+
3250 
+func  (this *FunctionBaseAPIController) GetYearEntrylist()  {
3251 
+	range_data := this.GetString("range_data")
3252 
+	fmt.Println("本日出库单",range_data)
3253 
+	page, _ := this.GetInt64("page", 1)
3254 
+	fmt.Println("页面",page)
3255 
+	limit, _ := this.GetInt64("limit", 10)
3256 
+	fmt.Println("limit",limit)
3257 
+	if page <= 0 {
3258 
+		page = 1
3259 
+	}
3260 
+	if limit <= 0 {
3261 
+		limit = 10
3262 
+	}
3263 
+	var rangeDate *time.Time
3264 
+	var parseDateErr error
3265 
+	var rangeTimeStamp int64
3266 
+
3267 
+	if len(range_data) > 0 {
3268 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3269 
+		if parseDateErr != nil {
3270 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3271 
+			return
3272 
+		}
3273 
+		rangeTimeStamp = rangeDate.Unix()
3274 
+	} else {
3275 
+		rangeTimeStamp = 0
3276 
+	}
3277 
+	now := time.Now().Unix()
3278 
+	userorg, total, err := service.GetTodayEntrylist(rangeTimeStamp, now, limit, page)
3279 
+	//3代表血透,2//退出登录状态
3280 
+	//userorgs, err := service.GetTodayLogout(0, 2)
3281 
+	//fmt.Scan("userorgs是什么",userorgs)
3282 
+	fmt.Println("userorg是什么",userorg)
3283 
+	fmt.Println("err",err)
3284 
+	fmt.Println("total是什么",total)
3285 
+	if err !=nil{
3286 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3287 
+		return
3288 
+	}
3289 
+	this.ServeSuccessJSON(map[string]interface{}{
3290 
+		"userorg":userorg,
3291 
+		"total":total,
3292 
+	})
3293 
+}
3294 
+
3295 
+func (this *FunctionBaseAPIController) GetTodayExitlist()  {
3296 
+	range_data := this.GetString("range_data")
3297 
+	fmt.Println("本日出库单",range_data)
3298 
+	page, _ := this.GetInt64("page", 1)
3299 
+	fmt.Println("页面",page)
3300 
+	limit, _ := this.GetInt64("limit", 10)
3301 
+	fmt.Println("limit",limit)
3302 
+	if page <= 0 {
3303 
+		page = 1
3304 
+	}
3305 
+	if limit <= 0 {
3306 
+		limit = 10
3307 
+	}
3308 
+	var rangeDate *time.Time
3309 
+	var parseDateErr error
3310 
+	var rangeTimeStamp int64
3311 
+
3312 
+	if len(range_data) > 0 {
3313 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3314 
+		if parseDateErr != nil {
3315 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3316 
+			return
3317 
+		}
3318 
+		rangeTimeStamp = rangeDate.Unix()
3319 
+	} else {
3320 
+		rangeTimeStamp = 0
3321 
+	}
3322 
+	now := time.Now().Unix()
3323 
+	userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
3324 
+	if err !=nil{
3325 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3326 
+		return
3327 
+	}
3328 
+	this.ServeSuccessJSON(map[string]interface{}{
3329 
+		"userorg":userorg,
3330 
+		"total":total,
3331 
+	})
3332 
+}
3333 
+
3334 
+func (this *FunctionBaseAPIController) GetYesterdayExitlist()  {
3335 
+	range_data := this.GetString("range_data")
3336 
+	fmt.Println("本日出库单",range_data)
3337 
+	page, _ := this.GetInt64("page", 1)
3338 
+	fmt.Println("页面",page)
3339 
+	limit, _ := this.GetInt64("limit", 10)
3340 
+	fmt.Println("limit",limit)
3341 
+	if page <= 0 {
3342 
+		page = 1
3343 
+	}
3344 
+	if limit <= 0 {
3345 
+		limit = 10
3346 
+	}
3347 
+	var rangeDate *time.Time
3348 
+	var parseDateErr error
3349 
+	var rangeTimeStamp int64
3350 
+
3351 
+	if len(range_data) > 0 {
3352 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3353 
+		if parseDateErr != nil {
3354 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3355 
+			return
3356 
+		}
3357 
+		rangeTimeStamp = rangeDate.Unix()
3358 
+	} else {
3359 
+		rangeTimeStamp = 0
3360 
+	}
3361 
+	now := time.Now().Unix()
3362 
+	userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
3363 
+	if err !=nil{
3364 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3365 
+		return
3366 
+	}
3367 
+	this.ServeSuccessJSON(map[string]interface{}{
3368 
+		"userorg":userorg,
3369 
+		"total":total,
3370 
+	})
3371 
+}
3372 
+
3373 
+func (this *FunctionBaseAPIController) GetWeekExitlist()  {
3374 
+	range_data := this.GetString("range_data")
3375 
+	fmt.Println("本日出库单",range_data)
3376 
+	page, _ := this.GetInt64("page", 1)
3377 
+	fmt.Println("页面",page)
3378 
+	limit, _ := this.GetInt64("limit", 10)
3379 
+	fmt.Println("limit",limit)
3380 
+	if page <= 0 {
3381 
+		page = 1
3382 
+	}
3383 
+	if limit <= 0 {
3384 
+		limit = 10
3385 
+	}
3386 
+	var rangeDate *time.Time
3387 
+	var parseDateErr error
3388 
+	var rangeTimeStamp int64
3389 
+
3390 
+	if len(range_data) > 0 {
3391 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3392 
+		if parseDateErr != nil {
3393 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3394 
+			return
3395 
+		}
3396 
+		rangeTimeStamp = rangeDate.Unix()
3397 
+	} else {
3398 
+		rangeTimeStamp = 0
3399 
+	}
3400 
+	now := time.Now().Unix()
3401 
+	userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
3402 
+	if err !=nil{
3403 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3404 
+		return
3405 
+	}
3406 
+	this.ServeSuccessJSON(map[string]interface{}{
3407 
+		"userorg":userorg,
3408 
+		"total":total,
3409 
+	})
3410 
+}
3411 
+
3412 
+func (this *FunctionBaseAPIController) GetMonthExitlist()  {
3413 
+	range_data := this.GetString("range_data")
3414 
+	fmt.Println("本日出库单",range_data)
3415 
+	page, _ := this.GetInt64("page", 1)
3416 
+	fmt.Println("页面",page)
3417 
+	limit, _ := this.GetInt64("limit", 10)
3418 
+	fmt.Println("limit",limit)
3419 
+	if page <= 0 {
3420 
+		page = 1
3421 
+	}
3422 
+	if limit <= 0 {
3423 
+		limit = 10
3424 
+	}
3425 
+	var rangeDate *time.Time
3426 
+	var parseDateErr error
3427 
+	var rangeTimeStamp int64
3428 
+
3429 
+	if len(range_data) > 0 {
3430 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3431 
+		if parseDateErr != nil {
3432 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3433 
+			return
3434 
+		}
3435 
+		rangeTimeStamp = rangeDate.Unix()
3436 
+	} else {
3437 
+		rangeTimeStamp = 0
3438 
+	}
3439 
+	now := time.Now().Unix()
3440 
+	userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
3441 
+	if err !=nil{
3442 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3443 
+		return
3444 
+	}
3445 
+	this.ServeSuccessJSON(map[string]interface{}{
3446 
+		"userorg":userorg,
3447 
+		"total":total,
3448 
+	})
3449 
+}
3450 
+
3451 
+func (this *FunctionBaseAPIController) GetThreeMonthExitlist()  {
3452 
+	range_data := this.GetString("range_data")
3453 
+	fmt.Println("本日出库单",range_data)
3454 
+	page, _ := this.GetInt64("page", 1)
3455 
+	fmt.Println("页面",page)
3456 
+	limit, _ := this.GetInt64("limit", 10)
3457 
+	fmt.Println("limit",limit)
3458 
+	if page <= 0 {
3459 
+		page = 1
3460 
+	}
3461 
+	if limit <= 0 {
3462 
+		limit = 10
3463 
+	}
3464 
+	var rangeDate *time.Time
3465 
+	var parseDateErr error
3466 
+	var rangeTimeStamp int64
3467 
+
3468 
+	if len(range_data) > 0 {
3469 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3470 
+		if parseDateErr != nil {
3471 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3472 
+			return
3473 
+		}
3474 
+		rangeTimeStamp = rangeDate.Unix()
3475 
+	} else {
3476 
+		rangeTimeStamp = 0
3477 
+	}
3478 
+	now := time.Now().Unix()
3479 
+	userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
3480 
+	if err !=nil{
3481 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3482 
+		return
3483 
+	}
3484 
+	this.ServeSuccessJSON(map[string]interface{}{
3485 
+		"userorg":userorg,
3486 
+		"total":total,
3487 
+	})
3488 
+}
3489 
+
3490 
+func (this *FunctionBaseAPIController) GetHalfExitlist()  {
3491 
+	range_data := this.GetString("range_data")
3492 
+	fmt.Println("本日出库单",range_data)
3493 
+	page, _ := this.GetInt64("page", 1)
3494 
+	fmt.Println("页面",page)
3495 
+	limit, _ := this.GetInt64("limit", 10)
3496 
+	fmt.Println("limit",limit)
3497 
+	if page <= 0 {
3498 
+		page = 1
3499 
+	}
3500 
+	if limit <= 0 {
3501 
+		limit = 10
3502 
+	}
3503 
+	var rangeDate *time.Time
3504 
+	var parseDateErr error
3505 
+	var rangeTimeStamp int64
3506 
+
3507 
+	if len(range_data) > 0 {
3508 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3509 
+		if parseDateErr != nil {
3510 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3511 
+			return
3512 
+		}
3513 
+		rangeTimeStamp = rangeDate.Unix()
3514 
+	} else {
3515 
+		rangeTimeStamp = 0
3516 
+	}
3517 
+	now := time.Now().Unix()
3518 
+	userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
3519 
+	if err !=nil{
3520 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3521 
+		return
3522 
+	}
3523 
+	this.ServeSuccessJSON(map[string]interface{}{
3524 
+		"userorg":userorg,
3525 
+		"total":total,
3526 
+	})
3527 
+}
3528 
+
3529 
+func (this *FunctionBaseAPIController) GetYearExitlist()  {
3530 
+	range_data := this.GetString("range_data")
3531 
+	fmt.Println("本日出库单",range_data)
3532 
+	page, _ := this.GetInt64("page", 1)
3533 
+	fmt.Println("页面",page)
3534 
+	limit, _ := this.GetInt64("limit", 10)
3535 
+	fmt.Println("limit",limit)
3536 
+	if page <= 0 {
3537 
+		page = 1
3538 
+	}
3539 
+	if limit <= 0 {
3540 
+		limit = 10
3541 
+	}
3542 
+	var rangeDate *time.Time
3543 
+	var parseDateErr error
3544 
+	var rangeTimeStamp int64
3545 
+
3546 
+	if len(range_data) > 0 {
3547 
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
3548 
+		if parseDateErr != nil {
3549 
+			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
3550 
+			return
3551 
+		}
3552 
+		rangeTimeStamp = rangeDate.Unix()
3553 
+	} else {
3554 
+		rangeTimeStamp = 0
3555 
+	}
3556 
+	now := time.Now().Unix()
3557 
+	userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
3558 
+	fmt.Println("错误是什么",err)
3559 
+	if err !=nil{
3560 
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
3561 
+		return
3562 
+	}
3563 
+	this.ServeSuccessJSON(map[string]interface{}{
3564 
+		"userorg":userorg,
3565 
+		"total":total,
3566 
+	})
3068 3567 
 }

+ 13 - 0
controllers/function_api_controllers/function_api_router_register.go Целия файл 

@@ -79,6 +79,19 @@ func FunctionAPIControllersRegisterRouters() {
79 79 
 	beego.Router("/api/function/getYearPostAssessment",&FunctionBaseAPIController{},"Get:GetYearPostAssessment")
80 80 
 	beego.Router("/api/function/gettodayentrylist",&FunctionBaseAPIController{},"Get:GetTodayEntrylist")
81 81 
 	beego.Router("/api/function/getyesterdayentrylist",&FunctionBaseAPIController{},"Get:GetYesterdayEntrylist")
82 
+	beego.Router("/api/function/getweekentrylist",&FunctionBaseAPIController{},"Get:GetWeekEntrylist")
83 
+	beego.Router("/api/function/getmonthentrylist",&FunctionBaseAPIController{},"Get:GetMonthEntrylist")
84 
+	beego.Router("/api/function/getthreemonthlist",&FunctionBaseAPIController{},"Get:GetThreeMonthEntrylist")
85 
+	beego.Router("/api/function/gethalfentrylsit",&FunctionBaseAPIController{},"Get:GetHalfYearEntrylist")
86 
+	beego.Router("/api/function/getyearentrylist",&FunctionBaseAPIController{},"Get:GetYearEntrylist")
87 
+	beego.Router("/api/function/gettodayexitlist",&FunctionBaseAPIController{},"Get:GetTodayExitlist")
88 
+	beego.Router("/api/function/getyestrdayexitlist",&FunctionBaseAPIController{},"Get:GetYesterdayExitlist")
89 
+	beego.Router("/api/function/getweekexitlist",&FunctionBaseAPIController{},"Get:GetWeekExitlist")
90 
+	beego.Router("/api/function/getmonthexitlist",&FunctionBaseAPIController{},"Get:GetMonthExitlist")
91 
+	beego.Router("/api/function/getthreemonthexitlist",&FunctionBaseAPIController{},"Get:GetThreeMonthExitlist")
92 
+	beego.Router("/api/function/gethalfexitlist",&FunctionBaseAPIController{},"Get:GetHalfExitlist")
93 
+	beego.Router("/api/function/getyearexitlist",&FunctionBaseAPIController{},"Get:GetYearExitlist")
94 
+
82 95
83 96
84 97 
 }

+ 34 - 2
models/function_models/fuction_query_models.go Целия файл 

@@ -511,10 +511,14 @@ func (XtAssessmentAfterDislysis) TableName() string {
511 511 
 }
512 512
513 513 
 type PatientInfo struct {
514 
+	ID  int64
514 515 
 	OrgName string
515 
-	Name  string
516 
+	Name string
516 517 
     Ctime string
517 518 
     Address string
519 
+	ContactName string
520 
+
521 
+
518 522 
 }
519 523
520 524 
 type SgjUserAdminLoginLog struct {
 
@@ -534,4 +538,32 @@ func (SgjUserAdminLoginLog) TableName() string {
534 538
535 539 
 type Logout struct {
536 540 
 	Ctime int64
537 
-}
541 
+}
542 
+
543 
+type SgjOrgFollow struct {
544 
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
545 
+	OrgId int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
546 
+	AdminUserId int64 `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
547 
+	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
548 
+	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
549 
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
550 
+}
551 
+
552 
+func (SgjOrgFollow) TableName() string {
553 
+	return "sgj_org_follow"
554 
+}
555 
+
556 
+type SgjAdmin struct {
557 
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
558 
+	Account string `gorm:"column:account" json:"account" form:"account"`
559 
+	Pwd string `gorm:"column:pwd" json:"pwd" form:"pwd"`
560 
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
561 
+	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
562 
+	Mtime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
563 
+	IsSuperAdmin int64 `gorm:"column:is_super_admin" json:"is_super_admin" form:"is_super_admin"`
564 
+	Name string `gorm:"column:name" json:"name" form:"name"`
565 
+}
566 
+func (SgjAdmin) TableName() string {
567 
+	return "sgj_admin"
568 
+}
569 
+

+ 20 - 16
service/function_service.go Целия файл 

@@ -9,7 +9,7 @@ import (
9 9 
 func GetTodayInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error) {
10 10
11 11 
 	offset := (page - 1) * limit
12 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
12 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
13 13 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_patients as x on x.user_org_id = u.id where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
14 14 
 	fmt.Println("rows是什么",rows)
15 15 
 	if rows.Next() {
 
@@ -23,7 +23,7 @@ func GetTodayInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []fun
23 23 
 func GetTodayDialysisPatientsInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
24 24
25 25 
 	offset := (page - 1) * limit
26 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
26 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
27 27 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_prescription as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
28 28 
 	if rows.Next() {
29 29 
 		rows.Scan(&total)
 
@@ -37,7 +37,7 @@ func GetTodayDialysisPatientsInfo(to int64,ctime int64,page int64,limit int64)(p
37 37 
 func GetTodayReceivePatientsInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
38 38
39 39 
 	offset := (page - 1) * limit
40 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
40 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u  join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
41 41 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_receive_treatment_asses as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
42 42 
 	if rows.Next() {
43 43 
 		rows.Scan(&total)
 
@@ -48,7 +48,7 @@ func GetTodayReceivePatientsInfo(to int64,ctime int64,page int64,limit int64)(pa
48 48 
 // 透前评估
49 49 
 func GetTodayBeforDislysisInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
50 50 
 	offset := (page - 1) * limit
51 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
51 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
52 52 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_before_dislysis as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
53 53 
 	if rows.Next() {
54 54 
 		rows.Scan(&total)
 
@@ -62,7 +62,7 @@ func GetTodayDoctorsOrderInfo(to int64,ctime int64,page int64,limit int64)(patie
62 62
63 63
64 64 
 	offset := (page - 1) * limit
65 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
65 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
66 66 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_doctor_advice as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
67 67 
 	if rows.Next() {
68 68 
 		rows.Scan(&total)
 
@@ -74,7 +74,7 @@ func GetTodayDoctorsOrderInfo(to int64,ctime int64,page int64,limit int64)(patie
74 74 
 func GetTodayDoubleCheckInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
75 75
76 76 
 	offset := (page - 1) * limit
77 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_double_check as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
77 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_double_check as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
78 78 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_double_check as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
79 79 
 	if rows.Next() {
80 80 
 		rows.Scan(&total)
 
@@ -86,7 +86,7 @@ func GetTodayDoubleCheckInfo(to int64,ctime int64,page int64,limit int64)(patien
86 86 
 func GetTodayDialysisMachinek(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
87 87
88 88 
 	offset := (page - 1) * limit
89 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
89 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
90 90 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
91 91 
 	if rows.Next() {
92 92 
 		rows.Scan(&total)
 
@@ -99,7 +99,7 @@ func GetTodayDialysisMachinek(to int64,ctime int64,page int64,limit int64)(patie
99 99 
 func GetTodayDialysisExamination(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error) {
100 100
101 101 
 	offset := (page - 1) * limit
102 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
102 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
103 103 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_monitoring_record as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
104 104 
 	if rows.Next() {
105 105 
 		rows.Scan(&total)
 
@@ -112,7 +112,7 @@ func GetTodayDialysisExamination(to int64,ctime int64,page int64,limit int64)(pa
112 112 
 func GetTodayBeforOrpenetration(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
113 113
114 114 
 	offset := (page - 1) * limit
115 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
115 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
116 116 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_dialysis_order as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
117 117 
 	if rows.Next() {
118 118 
 		rows.Scan(&total)
 
@@ -124,7 +124,7 @@ func GetTodayBeforOrpenetration(to int64,ctime int64,page int64,limit int64)(pat
124 124 
 //透后评估
125 125 
 func GetTodayPostAssessment(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
126 126 
 	offset := (page - 1) * limit
127 
-	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ?",to,ctime).Scan(&patientinfo).Error
127 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.patient_id  where x.created_time >= ? AND x.created_time <= ? GROUP BY x.user_org_id",to,ctime).Scan(&patientinfo).Error
128 128 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_assessment_after_dislysis as x on x.user_org_id = u.id  where x.created_time >= ? AND x.created_time <= ?", to, ctime).Rows()
129 129 
 	if rows.Next() {
130 130 
 		rows.Scan(&total)
 
@@ -135,7 +135,7 @@ func GetTodayPostAssessment(to int64,ctime int64,page int64,limit int64)(patient
135 135
136 136 
 func GetTodayEntrylist(to int64,ctime int64,limit int64,page int64)(patientinfo []function_models.PatientInfo,total int64, err error)  {
137 137 
 	 offset := (page - 1) * limit
138 
-	 err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse as x on x.org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.creater where x.warehousing_time >= ? AND x.warehousing_time<= ?",to,ctime).Scan(&patientinfo).Error
138 
+	 err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id  join sgj_xt.xt_warehouse as x on x.org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.creater  where x.warehousing_time >= ? AND x.warehousing_time<= ? GROUP BY x.org_id",to,ctime).Scan(&patientinfo).Error
139 139 
 	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse as x on x.org_id = u.id where x.warehousing_time >= ? AND x.warehousing_time <= ?", to, ctime).Rows()
140 140 
 	if rows.Next() {
141 141 
 		rows.Scan(&total)
 
@@ -144,8 +144,12 @@ func GetTodayEntrylist(to int64,ctime int64,limit int64,page int64)(patientinfo
144 144 
 	return patientinfo,total,err
145 145 
 }
146 146
147 
-//func GetTodayLogout(apptype int64,oppratetype int64)(userorg []function_models.SgjUserOrg,err error) {
148 
-//
149 
-//	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_users.sgj_user_admin_login_log as l on l.org_id = u.id where l.operate_type = ? AND l.app_type = ?", oppratetype, apptype).Scan(&userorg).Error
150 
-//	return userorg,err
151 
-//}
147 
+func GetTodayExitlist(to int64,ctime int64,limit int64,page int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
148 
+	offset := (page - 1) * limit
149 
+	err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u join sgj_org_follow as f On f.org_id = u.id JoIN sgj_admin as a On a.id = f.admin_user_id  join sgj_xt.xt_warehouse_out as x on x.org_id = u.id JOIN sgj_xt.xt_patients as p On p.id = x.creater  where x.warehouse_out_time >= ? AND x.warehouse_out_time<= ? GROUP BY x.org_id",to,ctime).Scan(&patientinfo).Error
150 
+	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse_out as x on x.org_id = u.id where x.warehouse_out_time >= ? AND x.warehouse_out_time <= ?", to, ctime).Rows()
151 
+	if rows.Next() {
152 
+		rows.Scan(&total)
153 
+	}
154 
+	return patientinfo,total,err
155 
+}