Selaa lähdekoodia

Merge branch 'master' of http://git.shengws.com/csx/XT_Admin_Api

csx 4 vuotta sitten
vanhempi
commit
6fc8260084

+ 175 - 67
.idea/workspace.xml Näytä tiedosto

@@ -2,10 +2,12 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="7aa7cc45-aece-4fa3-9063-5e3df12471b4" name="Default" comment="">
5
-      <change beforePath="$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_base_controller.go" beforeDir="false" afterPath="$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_base_controller.go" afterDir="false" />
6
-      <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" />
7
-      <change beforePath="$PROJECT_DIR$/routers/router.go" beforeDir="false" afterPath="$PROJECT_DIR$/routers/router.go" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/service/admin_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/admin_service.go" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/XT_Admin_Api.exe" beforeDir="false" afterPath="$PROJECT_DIR$/XT_Admin_Api.exe" afterDir="false" />
7
+      <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" />
8
+      <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" />
9
+      <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" />
10
+      <change beforePath="$PROJECT_DIR$/service/function_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/function_service.go" afterDir="false" />
9 11
     </list>
10 12
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 13
     <option name="TRACKING_ENABLED" value="true" />
@@ -16,20 +18,11 @@
16 18
   </component>
17 19
   <component name="FileEditorManager">
18 20
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
19
-      <file leaf-file-name="function_api_base_controller.go" pinned="false" current-in-tab="true">
20
-        <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
21
-          <provider selected="true" editor-type-id="text-editor">
22
-            <state relative-caret-position="238">
23
-              <caret line="1830" column="73" selection-start-line="1803" selection-start-column="6" selection-end-line="1830" selection-end-column="73" />
24
-            </state>
25
-          </provider>
26
-        </entry>
27
-      </file>
28 21
       <file leaf-file-name="analysis_api_controller.go" pinned="false" current-in-tab="false">
29 22
         <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
30 23
           <provider selected="true" editor-type-id="text-editor">
31
-            <state relative-caret-position="-965">
32
-              <caret line="512" column="28" selection-start-line="512" selection-start-column="8" selection-end-line="512" selection-end-column="28" />
24
+            <state relative-caret-position="394">
25
+              <caret line="427" selection-start-line="427" selection-end-line="427" />
33 26
             </state>
34 27
           </provider>
35 28
         </entry>
@@ -37,8 +30,8 @@
37 30
       <file leaf-file-name="function_api_router_register.go" pinned="false" current-in-tab="false">
38 31
         <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
39 32
           <provider selected="true" editor-type-id="text-editor">
40
-            <state relative-caret-position="311">
41
-              <caret line="54" selection-start-line="54" selection-end-line="54" />
33
+            <state relative-caret-position="207">
34
+              <caret line="80" column="81" selection-start-line="80" selection-start-column="56" selection-end-line="80" selection-end-column="81" />
42 35
               <folding>
43 36
                 <element signature="e#34#79#0" expanded="true" />
44 37
               </folding>
@@ -46,41 +39,35 @@
46 39
           </provider>
47 40
         </entry>
48 41
       </file>
49
-      <file leaf-file-name="function_service.go" pinned="false" current-in-tab="false">
50
-        <entry file="file://$PROJECT_DIR$/service/function_service.go">
51
-          <provider selected="true" editor-type-id="text-editor">
52
-            <state relative-caret-position="267">
53
-              <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
54
-            </state>
55
-          </provider>
56
-        </entry>
57
-      </file>
58
-      <file leaf-file-name="fuction_query_models.go" pinned="false" current-in-tab="false">
59
-        <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
42
+      <file leaf-file-name="admin_service.go" pinned="false" current-in-tab="false">
43
+        <entry file="file://$PROJECT_DIR$/service/admin_service.go">
60 44
           <provider selected="true" editor-type-id="text-editor">
61
-            <state relative-caret-position="1472">
62
-              <caret line="398" column="25" selection-start-line="398" selection-start-column="25" selection-end-line="398" selection-end-column="25" />
45
+            <state relative-caret-position="9636">
46
+              <caret line="444" selection-start-line="444" selection-end-line="444" />
47
+              <folding>
48
+                <element signature="e#35#139#0" expanded="true" />
49
+              </folding>
63 50
             </state>
64 51
           </provider>
65 52
         </entry>
66 53
       </file>
67
-      <file leaf-file-name="admin_service.go" pinned="false" current-in-tab="false">
68
-        <entry file="file://$PROJECT_DIR$/service/admin_service.go">
54
+      <file leaf-file-name="function_service.go" pinned="false" current-in-tab="false">
55
+        <entry file="file://$PROJECT_DIR$/service/function_service.go">
69 56
           <provider selected="true" editor-type-id="text-editor">
70
-            <state relative-caret-position="-902">
71
-              <caret line="473" column="124" selection-start-line="473" selection-start-column="67" selection-end-line="473" selection-end-column="124" />
57
+            <state relative-caret-position="-528">
58
+              <caret line="15" column="8" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
72 59
               <folding>
73
-                <element signature="e#35#139#0" expanded="true" />
60
+                <element signature="e#17#66#0" expanded="true" />
74 61
               </folding>
75 62
             </state>
76 63
           </provider>
77 64
         </entry>
78 65
       </file>
79
-      <file leaf-file-name="app.conf" pinned="false" current-in-tab="false">
80
-        <entry file="file://$PROJECT_DIR$/conf/app.conf">
66
+      <file leaf-file-name="function_api_base_controller.go" pinned="false" current-in-tab="true">
67
+        <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
81 68
           <provider selected="true" editor-type-id="text-editor">
82
-            <state>
83
-              <caret column="12" selection-start-column="12" selection-end-column="12" />
69
+            <state relative-caret-position="1298">
70
+              <caret line="3065" column="22" selection-start-line="3065" selection-start-column="22" selection-end-line="3065" selection-end-column="22" />
84 71
             </state>
85 72
           </provider>
86 73
         </entry>
@@ -106,8 +93,14 @@
106 93
       <find>patient_count_list</find>
107 94
       <find>aaa</find>
108 95
       <find>newPatientStatistics</find>
109
-      <find>GetMonthReceiveinfo</find>
110 96
       <find>/api/dialysis/start_record</find>
97
+      <find>GetMonthReceiveinfo</find>
98
+      <find>GetTodayDialysisMachinek</find>
99
+      <find>GetYearDialysisExamination</find>
100
+      <find>/api/function/getyeardialysisexamination</find>
101
+      <find>/api/function/getBeforDislysis</find>
102
+      <find>GetTodayBeforDislysisInfo</find>
103
+      <find>GetTodayInfo</find>
111 104
     </findStrings>
112 105
     <dirStrings>
113 106
       <dir>D:\goyard\src\XT_Admin_Api\controllers\admin_api_controllers</dir>
@@ -125,9 +118,9 @@
125 118
         <option value="$PROJECT_DIR$/controllers/admin_api_controllers/admin_api_base_controller.go" />
126 119
         <option value="$PROJECT_DIR$/service/admin_service.go" />
127 120
         <option value="$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go" />
128
-        <option value="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" />
129
-        <option value="$PROJECT_DIR$/service/function_service.go" />
130 121
         <option value="$PROJECT_DIR$/models/function_models/fuction_query_models.go" />
122
+        <option value="$PROJECT_DIR$/service/function_service.go" />
123
+        <option value="$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go" />
131 124
         <option value="$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go" />
132 125
       </list>
133 126
     </option>
@@ -169,7 +162,7 @@
169 162
             <path>
170 163
               <item name="XT_Admin_Api" type="b2602c69:ProjectViewProjectNode" />
171 164
               <item name="XT_Admin_Api" type="462c0819:PsiDirectoryNode" />
172
-              <item name="models" type="462c0819:PsiDirectoryNode" />
165
+              <item name="service" type="462c0819:PsiDirectoryNode" />
173 166
             </path>
174 167
           </expand>
175 168
           <select />
@@ -181,7 +174,7 @@
181 174
     <property name="DefaultGoTemplateProperty" value="Go Application" />
182 175
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
183 176
     <property name="go.sdk.automatically.set" value="true" />
184
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../XT" />
177
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
185 178
   </component>
186 179
   <component name="RunDashboard">
187 180
     <option name="ruleStates">
@@ -198,16 +191,15 @@
198 191
   <component name="ToolWindowManager">
199 192
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
200 193
     <layout>
201
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18096514" />
194
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19638069" />
202 195
       <window_info anchor="bottom" id="TODO" order="6" />
203
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.09852547" side_tool="true" weight="0.48644793" />
196
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.10522788" side_tool="true" visible="true" weight="0.29386592" />
204 197
       <window_info anchor="right" id="Database" order="3" />
205
-      <window_info anchor="bottom" id="Find" order="1" />
206 198
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
207 199
       <window_info anchor="bottom" id="Version Control" order="9" />
208 200
       <window_info anchor="bottom" id="Run" order="2" />
209 201
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
210
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.90147454" visible="true" weight="0.4293866" />
202
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.8947721" visible="true" weight="0.29386592" />
211 203
       <window_info id="Favorites" order="2" side_tool="true" />
212 204
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
213 205
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -216,6 +208,7 @@
216 208
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
217 209
       <window_info anchor="bottom" id="Message" order="0" />
218 210
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
211
+      <window_info anchor="bottom" id="Find" order="1" />
219 212
     </layout>
220 213
   </component>
221 214
   <component name="TypeScriptGeneratedFilesManager">
@@ -224,7 +217,122 @@
224 217
   <component name="VcsContentAnnotationSettings">
225 218
     <option name="myLimit" value="2678400000" />
226 219
   </component>
220
+  <component name="XDebuggerManager">
221
+    <breakpoint-manager>
222
+      <option name="time" value="1" />
223
+    </breakpoint-manager>
224
+  </component>
227 225
   <component name="editorHistoryManager">
226
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
227
+      <provider selected="true" editor-type-id="text-editor">
228
+        <state relative-caret-position="65296">
229
+          <caret line="2975" column="6" selection-start-line="2975" selection-start-column="6" selection-end-line="2975" selection-end-column="6" />
230
+        </state>
231
+      </provider>
232
+    </entry>
233
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
234
+      <provider selected="true" editor-type-id="text-editor">
235
+        <state relative-caret-position="9240">
236
+          <caret line="427" selection-start-line="427" selection-end-line="427" />
237
+        </state>
238
+      </provider>
239
+    </entry>
240
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
241
+      <provider selected="true" editor-type-id="text-editor">
242
+        <state relative-caret-position="1650">
243
+          <caret line="78" column="81" selection-start-line="78" selection-start-column="56" selection-end-line="78" selection-end-column="81" />
244
+          <folding>
245
+            <element signature="e#34#79#0" expanded="true" />
246
+          </folding>
247
+        </state>
248
+      </provider>
249
+    </entry>
250
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
251
+      <provider selected="true" editor-type-id="text-editor">
252
+        <state relative-caret-position="11176">
253
+          <caret line="508" column="40" selection-start-line="508" selection-start-column="12" selection-end-line="508" selection-end-column="40" />
254
+        </state>
255
+      </provider>
256
+    </entry>
257
+    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
258
+      <provider selected="true" editor-type-id="text-editor">
259
+        <state relative-caret-position="10274">
260
+          <caret line="473" column="124" selection-start-line="473" selection-start-column="124" selection-end-line="473" selection-end-column="124" />
261
+          <folding>
262
+            <element signature="e#35#139#0" expanded="true" />
263
+          </folding>
264
+        </state>
265
+      </provider>
266
+    </entry>
267
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
268
+      <provider selected="true" editor-type-id="text-editor">
269
+        <state>
270
+          <caret column="12" selection-start-column="12" selection-end-column="12" />
271
+        </state>
272
+      </provider>
273
+    </entry>
274
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
275
+      <provider selected="true" editor-type-id="text-editor">
276
+        <state relative-caret-position="1628">
277
+          <caret line="76" column="124" selection-start-line="76" selection-start-column="124" selection-end-line="76" selection-end-column="124" />
278
+        </state>
279
+      </provider>
280
+    </entry>
281
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
282
+      <provider selected="true" editor-type-id="text-editor">
283
+        <state relative-caret-position="41338">
284
+          <caret line="1886" column="62" selection-start-line="1886" selection-start-column="39" selection-end-line="1886" selection-end-column="62" />
285
+        </state>
286
+      </provider>
287
+    </entry>
288
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
289
+      <provider selected="true" editor-type-id="text-editor">
290
+        <state relative-caret-position="11110">
291
+          <caret line="512" column="28" selection-start-line="512" selection-start-column="8" selection-end-line="512" selection-end-column="28" />
292
+        </state>
293
+      </provider>
294
+    </entry>
295
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
296
+      <provider selected="true" editor-type-id="text-editor">
297
+        <state relative-caret-position="1166">
298
+          <caret line="53" column="83" selection-start-line="53" selection-start-column="58" selection-end-line="53" selection-end-column="83" />
299
+          <folding>
300
+            <element signature="e#34#79#0" expanded="true" />
301
+          </folding>
302
+        </state>
303
+      </provider>
304
+    </entry>
305
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
306
+      <provider selected="true" editor-type-id="text-editor">
307
+        <state relative-caret-position="1122">
308
+          <caret line="53" column="19" selection-start-line="53" selection-start-column="11" selection-end-line="53" selection-end-column="19" />
309
+        </state>
310
+      </provider>
311
+    </entry>
312
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
313
+      <provider selected="true" editor-type-id="text-editor">
314
+        <state relative-caret-position="7832">
315
+          <caret line="356" column="29" selection-start-line="356" selection-start-column="12" selection-end-line="356" selection-end-column="29" />
316
+        </state>
317
+      </provider>
318
+    </entry>
319
+    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
320
+      <provider selected="true" editor-type-id="text-editor">
321
+        <state relative-caret-position="10406">
322
+          <caret line="473" column="124" selection-start-line="473" selection-start-column="124" selection-end-line="473" selection-end-column="124" />
323
+          <folding>
324
+            <element signature="e#35#139#0" expanded="true" />
325
+          </folding>
326
+        </state>
327
+      </provider>
328
+    </entry>
329
+    <entry file="file://$PROJECT_DIR$/conf/app.conf">
330
+      <provider selected="true" editor-type-id="text-editor">
331
+        <state>
332
+          <caret column="12" selection-start-column="12" selection-end-column="12" />
333
+        </state>
334
+      </provider>
335
+    </entry>
228 336
     <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
229 337
       <provider selected="true" editor-type-id="text-editor">
230 338
         <state relative-caret-position="4158">
@@ -410,9 +518,6 @@
410 518
       <provider selected="true" editor-type-id="text-editor">
411 519
         <state relative-caret-position="506">
412 520
           <caret line="23" column="54" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="54" />
413
-          <folding>
414
-            <element signature="e#17#222#0" expanded="true" />
415
-          </folding>
416 521
         </state>
417 522
       </provider>
418 523
     </entry>
@@ -453,49 +558,52 @@
453 558
     </entry>
454 559
     <entry file="file://$PROJECT_DIR$/service/admin_service.go">
455 560
       <provider selected="true" editor-type-id="text-editor">
456
-        <state relative-caret-position="-902">
457
-          <caret line="473" column="124" selection-start-line="473" selection-start-column="67" selection-end-line="473" selection-end-column="124" />
561
+        <state relative-caret-position="9636">
562
+          <caret line="444" selection-start-line="444" selection-end-line="444" />
458 563
           <folding>
459 564
             <element signature="e#35#139#0" expanded="true" />
460 565
           </folding>
461 566
         </state>
462 567
       </provider>
463 568
     </entry>
464
-    <entry file="file://$PROJECT_DIR$/service/function_service.go">
569
+    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
465 570
       <provider selected="true" editor-type-id="text-editor">
466
-        <state relative-caret-position="267">
467
-          <caret line="53" column="29" selection-start-line="53" selection-start-column="29" selection-end-line="53" selection-end-column="29" />
571
+        <state relative-caret-position="329">
572
+          <caret line="531" column="36" selection-start-line="531" selection-start-column="36" selection-end-line="531" selection-end-column="36" />
468 573
         </state>
469 574
       </provider>
470 575
     </entry>
471
-    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
576
+    <entry file="file://$PROJECT_DIR$/service/function_service.go">
472 577
       <provider selected="true" editor-type-id="text-editor">
473
-        <state relative-caret-position="311">
474
-          <caret line="54" selection-start-line="54" selection-end-line="54" />
578
+        <state relative-caret-position="-528">
579
+          <caret line="15" column="8" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="8" />
475 580
           <folding>
476
-            <element signature="e#34#79#0" expanded="true" />
581
+            <element signature="e#17#66#0" expanded="true" />
477 582
           </folding>
478 583
         </state>
479 584
       </provider>
480 585
     </entry>
481
-    <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
586
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
482 587
       <provider selected="true" editor-type-id="text-editor">
483
-        <state relative-caret-position="1472">
484
-          <caret line="398" column="25" selection-start-line="398" selection-start-column="25" selection-end-line="398" selection-end-column="25" />
588
+        <state relative-caret-position="207">
589
+          <caret line="80" column="81" selection-start-line="80" selection-start-column="56" selection-end-line="80" selection-end-column="81" />
590
+          <folding>
591
+            <element signature="e#34#79#0" expanded="true" />
592
+          </folding>
485 593
         </state>
486 594
       </provider>
487 595
     </entry>
488 596
     <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
489 597
       <provider selected="true" editor-type-id="text-editor">
490
-        <state relative-caret-position="-965">
491
-          <caret line="512" column="28" selection-start-line="512" selection-start-column="8" selection-end-line="512" selection-end-column="28" />
598
+        <state relative-caret-position="394">
599
+          <caret line="427" selection-start-line="427" selection-end-line="427" />
492 600
         </state>
493 601
       </provider>
494 602
     </entry>
495 603
     <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
496 604
       <provider selected="true" editor-type-id="text-editor">
497
-        <state relative-caret-position="238">
498
-          <caret line="1830" column="73" selection-start-line="1803" selection-start-column="6" selection-end-line="1830" selection-end-column="73" />
605
+        <state relative-caret-position="1298">
606
+          <caret line="3065" column="22" selection-start-line="3065" selection-start-column="22" selection-end-line="3065" selection-end-column="22" />
499 607
         </state>
500 608
       </provider>
501 609
     </entry>

BIN
XT_Admin_Api.exe Näytä tiedosto


File diff suppressed because it is too large
+ 1265 - 29
controllers/function_api_controllers/function_api_base_controller.go


+ 31 - 1
controllers/function_api_controllers/function_api_router_register.go Näytä tiedosto

@@ -49,6 +49,36 @@ func FunctionAPIControllersRegisterRouters() {
49 49
 	beego.Router("/api/function/getThreeMonthDoubleCheckInfo",&FunctionBaseAPIController{},"Get:GetThreeMonthDoubleCheckInfo")
50 50
 	beego.Router("/api/function/getHalfYearDoubleCheckInfo",&FunctionBaseAPIController{},"Get:GetHalfYearDoubleCheckInfo")
51 51
 	beego.Router("/api/function/getyeardoublecheck",&FunctionBaseAPIController{},"Get:GetYearDoubleCheckInfo")
52
-	beego.Router("/api/function/getDialysisMachinek",&FunctionBaseAPIController{},"Get:GetTodayDialysisMachinek")
52
+	beego.Router("/api/function/getDialysisMachine",&FunctionBaseAPIController{},"Get:GetTodayDialysisMachinek")
53
+	beego.Router("/api/function/getyesterdayDialysisMachine",&FunctionBaseAPIController{},"Get:GetYesterTodayDialysisMachinek")
54
+	beego.Router("/api/function/getweekdialysismachaine",&FunctionBaseAPIController{},"Get:GetWeekDialsysImachaine")
55
+	beego.Router("/api/function/getmonthDialysisMachine",&FunctionBaseAPIController{},"Get:GetMonthDialsysImachaine")
56
+	beego.Router("/api/function/getthreeMonthDialysismachine",&FunctionBaseAPIController{},"Get:GetThreeMonthDialsysImachaine")
57
+	beego.Router("/api/function/gethalfyeardialysismachine",&FunctionBaseAPIController{},"Get:GetHalfYearDialysisMachine")
58
+	beego.Router("/api/function/getyeardialysismachine",&FunctionBaseAPIController{},"Get:GetYearDialysisMachine")
59
+	beego.Router("/api/function/gettodaydialysisexamination",&FunctionBaseAPIController{},"Get:GetTodayDialysisExamination")
60
+	beego.Router("/api/function/getyesterdayDialysisexamination",&FunctionBaseAPIController{},"Get:GetYesTodayDialysisExamination")
61
+	beego.Router("/api/function/getweekdialysisexamination",&FunctionBaseAPIController{},"Get:GetWeekDialysisExamination")
62
+	beego.Router("/api/function/getmonthdialysisexamination",&FunctionBaseAPIController{},"Get:GetMonthDialysisExamination")
63
+	beego.Router("/api/function/getthreeMonthDialysisExamination",&FunctionBaseAPIController{},"Get:GetThreeMonthDialysisExamination")
64
+	beego.Router("/api/function/getHalfYearDialysisExamination",&FunctionBaseAPIController{},"Get:GethalfyearDialysisExamination")
65
+	beego.Router("/api/function/getyeardialysisexamination",&FunctionBaseAPIController{},"Get:GetYearDialysisExamination")
66
+	beego.Router("/api/function/gettodaybeforpenetration",&FunctionBaseAPIController{},"Get:GetTodayBeforOrpenetration")
67
+	beego.Router("/api/function/getyesterdaybeforpenetration",&FunctionBaseAPIController{},"Get:GetYesterDayBeforpinetration")
68
+	beego.Router("/api/function/getWeekBeforPenetration",&FunctionBaseAPIController{},"Get:GetWeekBeforPenetration")
69
+	beego.Router("/api/function/getMonthBeforPenetration",&FunctionBaseAPIController{},"Get:GetMonthBeforPenetration")
70
+	beego.Router("/api/function/getThreeBeforePenetrationMonthInfo",&FunctionBaseAPIController{},"Get:GetThreeMonthBeforPenetration")
71
+	beego.Router("/api/function/getHalfYearPenetration",&FunctionBaseAPIController{},"Get:GetHalfYearBeforPenetration")
72
+	beego.Router("/api/function/getYearBeforPenetration",&FunctionBaseAPIController{},"Get:GetYearBeforPenetration")
73
+	beego.Router("/api/function/getTodayPostAssessment",&FunctionBaseAPIController{},"Get:GetTodayPostAssessment")
74
+	beego.Router("/api/function/getYesterDayPostAssessment",&FunctionBaseAPIController{},"Get:GetYesterDayPostAssessment")
75
+	beego.Router("/api/function/getWeekPostAssessment",&FunctionBaseAPIController{},"Get:GetWeekPostAssessment")
76
+	beego.Router("/api/function/getMonthPostAssessment",&FunctionBaseAPIController{},"Get:GetMonthPostAssessment")
77
+	beego.Router("/api/function/getThreeMonthAssessment",&FunctionBaseAPIController{},"Get:GetThreeMonthAssessment")
78
+	beego.Router("/api/function/getHalfYearPostAssessment",&FunctionBaseAPIController{},"Get:GetHalfYearPostAssessment")
79
+	beego.Router("/api/function/getYearPostAssessment",&FunctionBaseAPIController{},"Get:GetYearPostAssessment")
80
+	beego.Router("/api/function/gettodayentrylist",&FunctionBaseAPIController{},"Get:GetTodayEntrylist")
81
+	beego.Router("/api/function/getyesterdayentrylist",&FunctionBaseAPIController{},"Get:GetYesterdayEntrylist")
82
+
53 83
 
54 84
 }

+ 137 - 0
models/function_models/fuction_query_models.go Näytä tiedosto

@@ -393,8 +393,145 @@ type SgjUserOrg struct {
393 393
 	Website string `gorm:"column:website" json:"website" form:"website"`
394 394
 	Import int64 `gorm:"column:import" json:"import" form:"import"`
395 395
 	Sortno int64 `gorm:"column:sortno" json:"sortno" form:"sortno"`
396
+	//XtPatients  []XtPatients `gorm:"ForeignKey:UserOrgId"`
396 397
 }
397 398
 
398 399
 func (SgjUserOrg) TableName() string {
399 400
 	return "sgj_user_org"
400 401
 }
402
+
403
+type MonitoringRecord struct {
404
+	ID                        int64   `gorm:"column:id" json:"id"`
405
+	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id"`
406
+	PatientId                 int64   `gorm:"column:patient_id" json:"patient_id"`
407
+	DialysisOrderId           int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
408
+	MonitoringDate            int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
409
+	OperateTime               int64   `gorm:"column:operate_time" json:"operate_time"`
410
+	MonitoringTime            string  `gorm:"column:monitoring_time" json:"monitoring_time"`
411
+	PulseFrequency            float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
412
+	BreathingRate             float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
413
+	SystolicBloodPressure     float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
414
+	DiastolicBloodPressure    float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
415
+	BloodPressureType         int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
416
+	Pic                       string  `gorm:"column:pic" json:"pic"`
417
+	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
418
+	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
419
+	VenousPressureUnit        string  `gorm:"column:venous_pressure_unit" json:"venous_pressure_unit"`
420
+	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
421
+	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
422
+	TransmembranePressureUnit string  `gorm:"column:transmembrane_pressure_unit" json:"transmembrane_pressure_unit"`
423
+	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
424
+	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
425
+	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`
426
+	DialysateTemperature      float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
427
+	Temperature               float64 `gorm:"column:temperature" json:"temperature"`
428
+	ReplacementRate           float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
429
+	DisplacementQuantity      float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
430
+	Ktv                       float64 `gorm:"column:ktv" json:"ktv"`
431
+	Symptom                   string  `gorm:"column:symptom" json:"symptom"`
432
+	Dispose                   string  `gorm:"column:dispose" json:"dispose"`
433
+	Result                    string  `gorm:"column:result" json:"result"`
434
+	MonitoringNurse           int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
435
+	Status                    int64   `gorm:"column:status" json:"status"`
436
+	CreatedTime               int64   `gorm:"column:created_time" json:"created_time"`
437
+	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time"`
438
+	Conductivity              float64 `gorm:"column:conductivity" json:"conductivity"`
439
+	DisplacementFlowQuantity  float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
440
+}
441
+
442
+func (MonitoringRecord) TableName() string {
443
+	return "xt_monitoring_record"
444
+}
445
+
446
+type XtAssessmentAfterDislysis struct {
447
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
448
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
449
+	PatientId int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
450
+	AssessmentDate int64 `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
451
+	DialysisOrderId int64 `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
452
+	Temperature float64 `gorm:"column:temperature" json:"temperature" form:"temperature"`
453
+	PulseFrequency float64 `gorm:"column:pulse_frequency" json:"pulse_frequency" form:"pulse_frequency"`
454
+	BreathingRate float64 `gorm:"column:breathing_rate" json:"breathing_rate" form:"breathing_rate"`
455
+	SystolicBloodPressure float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure" form:"systolic_blood_pressure"`
456
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure" form:"diastolic_blood_pressure"`
457
+	BloodPressureType int64 `gorm:"column:blood_pressure_type" json:"blood_pressure_type" form:"blood_pressure_type"`
458
+	ActualUltrafiltration float64 `gorm:"column:actual_ultrafiltration" json:"actual_ultrafiltration" form:"actual_ultrafiltration"`
459
+	ActualDisplacement float64 `gorm:"column:actual_displacement" json:"actual_displacement" form:"actual_displacement"`
460
+	ActualTreatmentHour int64 `gorm:"column:actual_treatment_hour" json:"actual_treatment_hour" form:"actual_treatment_hour"`
461
+	ActualTreatmentMinute int64 `gorm:"column:actual_treatment_minute" json:"actual_treatment_minute" form:"actual_treatment_minute"`
462
+	WeighingWay string `gorm:"column:weighing_way" json:"weighing_way" form:"weighing_way"`
463
+	WeightAfter float64 `gorm:"column:weight_after" json:"weight_after" form:"weight_after"`
464
+	WeightLoss float64 `gorm:"column:weight_loss" json:"weight_loss" form:"weight_loss"`
465
+	Cruor string `gorm:"column:cruor" json:"cruor" form:"cruor"`
466
+	SymptomAfterDialysis string `gorm:"column:symptom_after_dialysis" json:"symptom_after_dialysis" form:"symptom_after_dialysis"`
467
+	InternalFistula string `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
468
+	Catheter string `gorm:"column:catheter" json:"catheter" form:"catheter"`
469
+	Complication string `gorm:"column:complication" json:"complication" form:"complication"`
470
+	Evaluator int64 `gorm:"column:evaluator" json:"evaluator" form:"evaluator"`
471
+	Remark string `gorm:"column:remark" json:"remark" form:"remark"`
472
+	DialysisIntakes int64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes" form:"dialysis_intakes"`
473
+	DialysisIntakesFeed int64 `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed" form:"dialysis_intakes_feed"`
474
+	DialysisIntakesTransfusion int64 `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion" form:"dialysis_intakes_transfusion"`
475
+	DialysisIntakesBloodTransfusion int64 `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion" form:"dialysis_intakes_blood_transfusion"`
476
+	DialysisIntakesWashpipe int64 `gorm:"column:dialysis_intakes_washpipe" json:"dialysis_intakes_washpipe" form:"dialysis_intakes_washpipe"`
477
+	Status int64 `gorm:"column:status" json:"status" form:"status"`
478
+	CreatedTime int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
479
+	UpdatedTime int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
480
+	Creater int64 `gorm:"column:creater" json:"creater" form:"creater"`
481
+	Modifier int64 `gorm:"column:modifier" json:"modifier" form:"modifier"`
482
+	BloodAccessPartId int64 `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
483
+	BloodAccessPartOperaId int64 `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
484
+	PuncturePointOozingBlood int64 `gorm:"column:puncture_point_oozing_blood" json:"puncture_point_oozing_blood" form:"puncture_point_oozing_blood"`
485
+	PuncturePointHaematoma int64 `gorm:"column:puncture_point_haematoma" json:"puncture_point_haematoma" form:"puncture_point_haematoma"`
486
+	InternalFistulaTremorAc int64 `gorm:"column:internal_fistula_tremor_ac" json:"internal_fistula_tremor_ac" form:"internal_fistula_tremor_ac"`
487
+	PatientGose int64 `gorm:"column:patient_gose" json:"patient_gose" form:"patient_gose"`
488
+	InpatientDepartment string `gorm:"column:inpatient_department" json:"inpatient_department" form:"inpatient_department"`
489
+	ObservationContent string `gorm:"column:observation_content" json:"observation_content" form:"observation_content"`
490
+	ObservationContentOther string `gorm:"column:observation_content_other" json:"observation_content_other" form:"observation_content_other"`
491
+	DryWeight float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
492
+	DialysisProcess int64 `gorm:"column:dialysis_process" json:"dialysis_process" form:"dialysis_process"`
493
+	InAdvanceMinute float64 `gorm:"column:in_advance_minute" json:"in_advance_minute" form:"in_advance_minute"`
494
+	InAdvanceReason string `gorm:"column:in_advance_reason" json:"in_advance_reason" form:"in_advance_reason"`
495
+	HemostasisMinute int64 `gorm:"column:hemostasis_minute" json:"hemostasis_minute" form:"hemostasis_minute"`
496
+	HemostasisOpera int64 `gorm:"column:hemostasis_opera" json:"hemostasis_opera" form:"hemostasis_opera"`
497
+	TremorNoise int64 `gorm:"column:tremor_noise" json:"tremor_noise" form:"tremor_noise"`
498
+	DisequilibriumSyndrome int64 `gorm:"column:disequilibrium_syndrome" json:"disequilibrium_syndrome" form:"disequilibrium_syndrome"`
499
+	DisequilibriumSyndromeOption string `gorm:"column:disequilibrium_syndrome_option" json:"disequilibrium_syndrome_option" form:"disequilibrium_syndrome_option"`
500
+	ArterialTube int64 `gorm:"column:arterial_tube" json:"arterial_tube" form:"arterial_tube"`
501
+	IntravenousTube int64 `gorm:"column:intravenous_tube" json:"intravenous_tube" form:"intravenous_tube"`
502
+	Dialyzer int64 `gorm:"column:dialyzer" json:"dialyzer" form:"dialyzer"`
503
+	InAdvanceReasonOther string `gorm:"column:in_advance_reason_other" json:"in_advance_reason_other" form:"in_advance_reason_other"`
504
+	AssessmentDoctor int64 `gorm:"column:assessment_doctor" json:"assessment_doctor" form:"assessment_doctor"`
505
+	AssessmentTime int64 `gorm:"column:assessment_time" json:"assessment_time" form:"assessment_time"`
506
+	IsEat int64 `gorm:"column:is_eat" json:"is_eat" form:"is_eat"`
507
+}
508
+
509
+func (XtAssessmentAfterDislysis) TableName() string {
510
+	return "xt_assessment_after_dislysis"
511
+}
512
+
513
+type PatientInfo struct {
514
+	OrgName string
515
+	Name  string
516
+    Ctime string
517
+    Address string
518
+}
519
+
520
+type SgjUserAdminLoginLog struct {
521
+	ID int64 `gorm:"column:id" json:"id" form:"id"`
522
+	AdminUserId int64 `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
523
+	OrgId int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
524
+	AppId int64 `gorm:"column:app_id" json:"app_id" form:"app_id"`
525
+	Ip string `gorm:"column:ip" json:"ip" form:"ip"`
526
+	OperateType int64 `gorm:"column:operate_type" json:"operate_type" form:"operate_type"`
527
+	AppType int64 `gorm:"column:app_type" json:"app_type" form:"app_type"`
528
+	Ctime int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
529
+}
530
+
531
+func (SgjUserAdminLoginLog) TableName() string {
532
+	return "sgj_user_admin_login_log "
533
+}
534
+
535
+type Logout struct {
536
+	Ctime int64
537
+} 

+ 128 - 32
service/function_service.go Näytä tiedosto

@@ -2,54 +2,150 @@ package service
2 2
 
3 3
 import (
4 4
 	"XT_Admin_Api/models/function_models"
5
+	"fmt"
5 6
 )
6 7
 
7
-func GetTodayInfo(to int64,ctime int64,page int64,limit int64)(patients []function_models.XtPatients,total int64,err error) {
8
-	db := readDb.Table("xt_patients as p").Where("p.status = 1")
8
+//病人管理
9
+func GetTodayInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error) {
10
+
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
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
+	fmt.Println("rows是什么",rows)
15
+	if rows.Next() {
16
+		rows.Scan(&total)
17
+	}
18
+	fmt.Println("&total是什么",total)
19
+	return patientinfo,total,err
20
+}
21
+
22
+   //透析处方
23
+func GetTodayDialysisPatientsInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
24
+
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
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
+	if rows.Next() {
29
+		rows.Scan(&total)
30
+	}
31
+
32
+	return patientinfo,total,err
33
+}
34
+
35
+
36
+   //接诊评估
37
+func GetTodayReceivePatientsInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
38
+
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
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
+	if rows.Next() {
43
+		rows.Scan(&total)
44
+	}
45
+
46
+	return patientinfo,total,err
47
+}
48
+// 透前评估
49
+func GetTodayBeforDislysisInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
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
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
+	if rows.Next() {
54
+		rows.Scan(&total)
55
+	}
56
+
57
+	return patientinfo,total,err
58
+}
59
+
60
+ //零食医嘱
61
+func GetTodayDoctorsOrderInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
62
+
63
+
9 64
 	offset := (page - 1) * limit
10
-	err = db.Where("status <> 0 AND created_time >= ? AND created_time <= ?", to, ctime).
11
-		Count(&total).Order("p.created_time desc").Offset(offset).Limit(limit).
12
-		Select("p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").
13
-	Find(&patients).Error
14
-    return patients,total,err
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
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
+	if rows.Next() {
68
+		rows.Scan(&total)
69
+	}
70
+
71
+	return patientinfo,total,err
15 72
 }
73
+//双人核对
74
+func GetTodayDoubleCheckInfo(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
16 75
 
17
-func GetTodayDialysisPatientsInfo(to int64,ctime int64,page int64,limit int64)(patients []function_models.XtPatients,total int64,err error)  {
18
-	db := readDb.Table("xt_patients as p").Where("p.status = 1")
19 76
 	offset := (page - 1) * limit
20
-	err = db.Select("p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").
21
-		Joins("join xt_dialysis_prescription as x On x.patient_id = p.id").Where("x.created_time >= ? AND x.created_time <= ?", to, ctime).Count(&total).Order("p.created_time desc").Offset(offset).Limit(limit).Find(&patients).Error
22
-   return patients,total,err
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
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
+	if rows.Next() {
80
+		rows.Scan(&total)
81
+	}
82
+
83
+	return patientinfo,total,err
23 84
 }
85
+//透析上机
86
+func GetTodayDialysisMachinek(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
24 87
 
25
-func GetTodayReceivePatientsInfo(to int64,ctime int64,page int64,limit int64)(patients []function_models.XtPatients,total int64,err error)  {
26
-	db := readDb.Table("xt_patients as p").Where("p.status = 1")
27 88
 	offset := (page - 1) * limit
28
-	err = db.Select("p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").
29
-		Joins("join xt_receive_treatment_asses as x On x.patient_id = p.id").Where("x.created_time >= ? AND x.created_time <= ?", to, ctime).Count(&total).Order("p.created_time desc").Offset(offset).Limit(limit).Find(&patients).Error
30
-	return patients,total,err
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
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
+	if rows.Next() {
92
+		rows.Scan(&total)
93
+	}
94
+
95
+	return patientinfo,total,err
31 96
 }
32 97
 
33
-func GetTodayDoctorsOrderInfo(to int64,ctime int64,page int64,limit int64)(patients []function_models.XtPatients,total int64,err error)  {
34
-	db := readDb.Table("xt_patients as p").Where("p.status = 1")
98
+//透析检测
99
+func GetTodayDialysisExamination(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error) {
100
+
35 101
 	offset := (page - 1) * limit
36
-	err = db.Select("p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").
37
-		Joins("join xt_doctor_advice as x On x.patient_id = p.id").Where("x.created_time >= ? AND x.created_time <= ?", to, ctime).Count(&total).Order("p.created_time desc").Offset(offset).Limit(limit).Find(&patients).Error
38
-	return patients,total,err
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
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
+	if rows.Next() {
105
+		rows.Scan(&total)
106
+	}
107
+
108
+	return patientinfo,total,err
39 109
 }
40 110
 
41
-func GetTodayDoubleCheckInfo(to int64,ctime int64,page int64,limit int64)(patients []function_models.XtPatients,total int64,err error)  {
42
-	db := readDb.Table("xt_patients as p").Where("p.status = 1")
111
+//透析下机
112
+func GetTodayBeforOrpenetration(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
113
+
43 114
 	offset := (page - 1) * limit
44
-	err = db.Select("p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").
45
-		Joins("join xt_double_check as x On x.patient_id = p.id").Where("x.created_time >= ? AND x.created_time <= ?", to, ctime).Count(&total).Order("p.created_time desc").Offset(offset).Limit(limit).Find(&patients).Error
46
-	return patients,total,err
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
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
+	if rows.Next() {
118
+		rows.Scan(&total)
119
+	}
120
+
121
+	return patientinfo,total,err
47 122
 }
48 123
 
49
-func GetTodayDialysisMachinek(to int64,ctime int64,page int64,limit int64)(patients []function_models.XtPatients,total int64,err error)  {
50
-	db := readDb.Table("xt_patients as p").Where("p.status = 1")
124
+//透后评估
125
+func GetTodayPostAssessment(to int64,ctime int64,page int64,limit int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
51 126
 	offset := (page - 1) * limit
52
-	err = db.Select("p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").
53
-		Joins("join xt_double_check as x On x.patient_id = p.id").Where("x.created_time >= ? AND x.created_time <= ?", to, ctime).Count(&total).Order("p.created_time desc").Offset(offset).Limit(limit).Find(&patients).Error
54
-	return patients,total,err
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
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
+	if rows.Next() {
130
+		rows.Scan(&total)
131
+	}
132
+
133
+	return patientinfo,total,err
55 134
 }
135
+
136
+func GetTodayEntrylist(to int64,ctime int64,limit int64,page int64)(patientinfo []function_models.PatientInfo,total int64, err error)  {
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
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
+	if rows.Next() {
141
+		rows.Scan(&total)
142
+	}
143
+
144
+	return patientinfo,total,err
145
+}
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
+//}