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

.idea/workspace.xml

   <component name="ChangeListManager">
     <list default="true" id="7aa7cc45-aece-4fa3-9063-5e3df12471b4" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/XT_Admin_Api.exe" beforeDir="false" afterPath="$PROJECT_DIR$/XT_Admin_Api.exe" afterDir="false" />
       <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" />
       <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" />
-      <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" />
       <change beforePath="$PROJECT_DIR$/service/function_service.go" beforeDir="false" afterPath="$PROJECT_DIR$/service/function_service.go" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="analysis_api_controller.go" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="437">
-              <caret line="427" selection-start-line="427" selection-end-line="427" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="function_api_router_register.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="388">
-              <caret line="95" selection-start-line="95" selection-end-line="95" />
+            <state relative-caret-position="47">
+              <caret line="87" column="79" selection-start-line="87" selection-start-column="54" selection-end-line="87" selection-end-column="79" />
               <folding>
                 <element signature="e#34#79#0" expanded="true" />
               </folding>
       <file leaf-file-name="function_service.go" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/service/function_service.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="149" column="219" selection-start-line="149" selection-start-column="219" selection-end-line="149" selection-end-column="219" />
+            <state relative-caret-position="296">
+              <caret line="137" column="248" selection-start-line="137" selection-start-column="248" selection-end-line="137" selection-end-column="248" />
               <folding>
                 <element signature="e#17#73#0" expanded="true" />
               </folding>
       <file leaf-file-name="fuction_query_models.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="471">
+            <state relative-caret-position="11286">
               <caret line="513" column="13" selection-start-line="513" selection-start-column="13" selection-end-line="513" selection-end-column="13" />
             </state>
           </provider>
       <file leaf-file-name="function_api_base_controller.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="3556" column="51" selection-start-line="3556" selection-start-column="35" selection-end-line="3556" selection-end-column="51" />
+            <state relative-caret-position="319">
+              <caret line="3601" column="90" selection-start-line="3601" selection-start-column="90" selection-end-line="3601" selection-end-column="90" />
             </state>
           </provider>
         </entry>
       <file leaf-file-name="router.go" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/routers/router.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="104">
+            <state relative-caret-position="154">
               <caret line="12" column="80" selection-start-line="12" selection-start-column="71" selection-end-line="12" selection-end-column="80" />
             </state>
           </provider>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>/admin/api/patient/analysis</find>
-      <find>PatientAnalysis</find>
-      <find>AdminAPIControllersRegisterRouters</find>
-      <find>admin_api_controllers</find>
-      <find>/admin/api/home/statistics</find>
-      <find>HomeStatistics</find>
       <find>SchedualPatient</find>
       <find>patient_count_list</find>
       <find>aaa</find>
       <find>/api/function/getBeforDislysis</find>
       <find>GetTodayBeforDislysisInfo</find>
       <find>GetTodayInfo</find>
+      <find>/api/function/getYesterdayDialysisinfo</find>
+      <find>GetYesterTodayDialysisInfo</find>
+      <find>GetYesTodayReceiveinfo</find>
+      <find>/api/function/getyesterdayBeforDislysis</find>
+      <find>GetYesterDayDoctorsOrderInfo</find>
+      <find>GetYesterTodayBeforDislysisInfo</find>
+      <find>/api/function/getyearstodayDoctorOrder</find>
+      <find>/api/function/getYesTodayDoubleCheckInfo</find>
+      <find>/api/function/getyesterdayDialysisMachine</find>
+      <find>GetYesterTodayDialysisMachinek</find>
+      <find>GetYesTodayDialysisExamination</find>
+      <find>/api/function/getyesterdaybeforpenetration</find>
+      <find>GetYesterDayBeforpinetration</find>
+      <find>/api/function/getYesterDayPostAssessment</find>
+      <find>/api/function/getyesterdayentrylist</find>
+      <find>GetYesterdayEntrylist</find>
+      <find>GetYesterdayExitlist</find>
+      <find>/api/function/getyestrdayexitlist</find>
     </findStrings>
     <dirStrings>
       <dir>D:\goyard\src\XT_Admin_Api\controllers\admin_api_controllers</dir>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="37" />
-    <option name="y" value="53" />
-    <option name="width" value="1690" />
+    <option name="x" value="525" />
+    <option name="width" value="1230" />
     <option name="height" value="1040" />
   </component>
   <component name="ProjectView">
     <property name="DefaultGoTemplateProperty" value="Go Application" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../SCRM" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../XT" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20442359" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20710456" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.102546915" side_tool="true" visible="true" weight="0.47075605" />
+      <window_info anchor="bottom" id="Event Log" order="7" sideWeight="0.113270774" side_tool="true" visible="true" weight="0.39372325" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="9" />
       <window_info anchor="bottom" id="Run" order="2" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.89745307" visible="true" weight="0.47075605" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.88672924" visible="true" weight="0.39372325" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
     </entry>
     <entry file="file://$PROJECT_DIR$/routers/router.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="104">
+        <state relative-caret-position="154">
           <caret line="12" column="80" selection-start-line="12" selection-start-column="71" selection-end-line="12" selection-end-column="80" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="427" selection-start-line="427" selection-end-line="427" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/conf/app.conf">
       <provider selected="true" editor-type-id="text-editor">
         <state>
     </entry>
     <entry file="file://$PROJECT_DIR$/models/function_models/fuction_query_models.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="471">
+        <state relative-caret-position="11286">
           <caret line="513" column="13" selection-start-line="513" selection-start-column="13" selection-end-line="513" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
+    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="388">
-          <caret line="95" selection-start-line="95" selection-end-line="95" />
-          <folding>
-            <element signature="e#34#79#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="572">
+          <caret line="34" column="1" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/service/admin_service.go">
+    <entry file="file://$PROJECT_DIR$/controllers/admin_api_controllers/analysis_api_controller.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="572">
-          <caret line="34" column="1" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
+        <state relative-caret-position="9240">
+          <caret line="427" selection-start-line="427" selection-end-line="427" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_base_controller.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="3556" column="51" selection-start-line="3556" selection-start-column="35" selection-end-line="3556" selection-end-column="51" />
+        <state relative-caret-position="319">
+          <caret line="3601" column="90" selection-start-line="3601" selection-start-column="90" selection-end-line="3601" selection-end-column="90" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/controllers/function_api_controllers/function_api_router_register.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="47">
+          <caret line="87" column="79" selection-start-line="87" selection-start-column="54" selection-end-line="87" selection-end-column="79" />
+          <folding>
+            <element signature="e#34#79#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/service/function_service.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="149" column="219" selection-start-line="149" selection-start-column="219" selection-end-line="149" selection-end-column="219" />
+        <state relative-caret-position="296">
+          <caret line="137" column="248" selection-start-line="137" selection-start-column="248" selection-end-line="137" selection-end-column="248" />
           <folding>
             <element signature="e#17#73#0" expanded="true" />
           </folding>

controllers/function_api_controllers/function_api_base_controller.go

 	}
 	range_data := this.GetString("range_data")
 	fmt.Println("昨日日期",range_data)
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+    var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	patients, total, err := service.GetTodayInfo(rangeTimeStamp, now,page,limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	patients, total, err := service.GetTodayInfo(startrangeTimeStamp, endrangeTimeStamp,page,limit)
 	fmt.Println("total",total)
 	fmt.Println("patients是什么",patients)
 	fmt.Println("查询错误是什么",err)
 	if limit <= 0 {
 		limit = 10
 	}
-
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	dialysis, total, err := service.GetTodayDialysisPatientsInfo(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+
+	dialysis, total, err := service.GetTodayDialysisPatientsInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("dialysis",dialysis)
 	fmt.Println("total",total)
 	fmt.Println("报错",err)
 
 func (this *FunctionBaseAPIController) GetYesTodayReceiveinfo()  {
 	range_data := this.GetString("range_data")
-	fmt.Println("本月透析处方日期",range_data)
+	fmt.Println("昨日接诊评估",range_data)
 	page, _ := this.GetInt64("page", 1)
 	fmt.Println("页面",page)
 	limit, _ := this.GetInt64("limit", 10)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	receive, total, err := service.GetTodayReceivePatientsInfo(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	receive, total, err := service.GetTodayReceivePatientsInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("patients",receive)
 	fmt.Println("total",total)
 	fmt.Println("错误",err)
 
 func (this *FunctionBaseAPIController) GetYesterTodayBeforDislysisInfo()  {
 	range_data := this.GetString("range_data")
-	fmt.Println("本月透析处方日期",range_data)
+	fmt.Println("昨日透前评估日期",range_data)
 	page, _ := this.GetInt64("page", 1)
 	fmt.Println("页面",page)
 	limit, _ := this.GetInt64("limit", 10)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	receive, total, err := service.GetTodayReceivePatientsInfo(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	receive, total, err := service.GetTodayReceivePatientsInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("patients",receive)
 	fmt.Println("total",total)
 	fmt.Println("错误",err)
 
 func (this *FunctionBaseAPIController) GetYesterDayDoctorsOrderInfo()  {
 	range_data := this.GetString("range_data")
-	fmt.Println("本月透析处方日期",range_data)
+	fmt.Println("昨日零时意识",range_data)
 	page, _ := this.GetInt64("page", 1)
 	fmt.Println("页面",page)
 	limit, _ := this.GetInt64("limit", 10)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	receive, total, err := service.GetTodayDoctorsOrderInfo(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	receive, total, err := service.GetTodayDoctorsOrderInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("patients",receive)
 	fmt.Println("total",total)
 	fmt.Println("错误",err)
 
 func (this *FunctionBaseAPIController) GetYesTodayDoubleCheckInfo()  {
 	range_data := this.GetString("range_data")
-	fmt.Println("本月透析处方日期",range_data)
+	fmt.Println("昨日双人核对",range_data)
 	page, _ := this.GetInt64("page", 1)
 	fmt.Println("页面",page)
 	limit, _ := this.GetInt64("limit", 10)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	receive, total, err := service.GetTodayDoubleCheckInfo(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	receive, total, err := service.GetTodayDoubleCheckInfo(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("patients",receive)
 	fmt.Println("total",total)
 	fmt.Println("错误",err)
 
 func (this *FunctionBaseAPIController) GetYesterTodayDialysisMachinek()  {
 	range_data := this.GetString("range_data")
-	fmt.Println("本月透析处方日期",range_data)
+	fmt.Println("昨日透析上机",range_data)
 	page, _ := this.GetInt64("page", 1)
 	fmt.Println("页面",page)
 	limit, _ := this.GetInt64("limit", 10)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	patients, total, err := service.GetTodayDialysisMachinek(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	patients, total, err := service.GetTodayDialysisMachinek(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("patients",patients)
 	fmt.Println("total",total)
 	fmt.Println("错误",err)
 
 func  (this *FunctionBaseAPIController) GetYesTodayDialysisExamination()  {
 	range_data := this.GetString("range_data")
-	fmt.Println("本月透析处方日期",range_data)
+	fmt.Println("昨日透析检测",range_data)
 	page, _ := this.GetInt64("page", 1)
 	fmt.Println("页面",page)
 	limit, _ := this.GetInt64("limit", 10)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	patients, total, err := service.GetTodayDialysisExamination(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	patients, total, err := service.GetTodayDialysisExamination(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("patients",patients)
 	fmt.Println("total",total)
 	fmt.Println("错误",err)
 
 func (this *FunctionBaseAPIController) GetYesterDayBeforpinetration()  {
 	range_data := this.GetString("range_data")
-	fmt.Println("本月透析处方日期",range_data)
+	fmt.Println("昨日",range_data)
 	page, _ := this.GetInt64("page", 1)
 	fmt.Println("页面",page)
 	limit, _ := this.GetInt64("limit", 10)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	patients, total, err := service.GetTodayBeforOrpenetration(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	patients, total, err := service.GetTodayBeforOrpenetration(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("patients",patients)
 	fmt.Println("total",total)
 	fmt.Println("错误",err)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	patients, total, err := service.GetTodayPostAssessment(rangeTimeStamp, now, page, limit)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	patients, total, err := service.GetTodayPostAssessment(startrangeTimeStamp, endrangeTimeStamp, page, limit)
 	fmt.Println("patients",patients)
 	fmt.Println("total",total)
 	fmt.Println("错误",err)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	userorg, total, err := service.GetTodayEntrylist(rangeTimeStamp, now, limit, page)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	userorg, total, err := service.GetTodayEntrylist(startrangeTimeStamp, endrangeTimeStamp, limit, page)
 	//3代表血透,2//退出登录状态
 	//userorgs, err := service.GetTodayLogout(0, 2)
 	//fmt.Scan("userorgs是什么",userorgs)
 	if limit <= 0 {
 		limit = 10
 	}
+	starttime := this.GetString("starttime")
+	fmt.Println("昨日开始时间",starttime)
+	endtime := this.GetString("endtime")
+	fmt.Println("昨日结束时间",endtime)
 	var rangeDate *time.Time
 	var parseDateErr error
-	var rangeTimeStamp int64
+	var startrangeTimeStamp int64
+	var endrangeTimeStamp  int64
 
-	if len(range_data) > 0 {
-		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02", range_data)
+	if len(starttime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", starttime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
 		if parseDateErr != nil {
-			this.ErrorLog("日期(%v)解析错误：%v", range_data, parseDateErr)
+			this.ErrorLog("日期(%v)解析错误：%v", starttime, parseDateErr)
 			return
 		}
-		rangeTimeStamp = rangeDate.Unix()
+		startrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("startrangeTimeStamp是多少?",startrangeTimeStamp)
 	} else {
-		rangeTimeStamp = 0
+		startrangeTimeStamp = 0
 	}
-	now := time.Now().Unix()
-	userorg, total, err := service.GetTodayExitlist(rangeTimeStamp, now, limit, page)
+	if len(endtime) > 0 {
+		rangeDate, parseDateErr = utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtime)
+		fmt.Println("rangeData是什么",rangeDate)
+		fmt.Println("parseDateErr",parseDateErr)
+		if parseDateErr != nil {
+			this.ErrorLog("日期(%v)解析错误：%v", endtime, parseDateErr)
+			return
+		}
+		endrangeTimeStamp = rangeDate.Unix()
+		fmt.Println("endrangeTimeStamp是多少?",endrangeTimeStamp)
+	} else {
+		endrangeTimeStamp = 0
+	}
+	userorg, total, err := service.GetTodayExitlist(startrangeTimeStamp, endrangeTimeStamp, limit, page)
 	if err !=nil{
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更改数据失败")
 		return

controllers/function_api_controllers/function_api_router_register.go

 	beego.Router("/api/function/gethalfyeardialysisinfo",&FunctionBaseAPIController{},"Get:GetHalfYearDailysisInfo")
 	beego.Router("/api/function/getyeardialysisinfo",&FunctionBaseAPIController{},"Get:GetYearDailysisInfo")
 	beego.Router("/api/function/gettodayreceiveinfo",&FunctionBaseAPIController{},"Get:GetReceiveinfo")
-	beego.Router("/api/function/getyesterdayinfo",&FunctionBaseAPIController{},"Get:GetYesTodayReceiveinfo")
+	beego.Router("/api/function/getReceiveyesterdayinfo",&FunctionBaseAPIController{},"Get:GetYesTodayReceiveinfo")
 	beego.Router("/api/function/getweekreceiveinfo",&FunctionBaseAPIController{},"Get:GetWeekReceiveinfo")
 	beego.Router("/api/function/getMonthreceiveinfo",&FunctionBaseAPIController{},"Get:GetMonthReceiveinfo")
 	beego.Router("/api/function/getMonthreereceiveinfo",&FunctionBaseAPIController{},"Get:GetThreeMonthReceiveinfo")

service/function_service.go

 
 func GetTodayEntrylist(to int64,ctime int64,limit int64,page int64)(patientinfo []function_models.PatientInfo,total int64, err error)  {
 	 offset := (page - 1) * limit
-	 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
-	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()
+	 err = readUserDb.Raw("select * from sgj_users.sgj_user_org as u  join sgj_xt.xt_warehouse_info as x on x.org_id = u.id  LEFT JOIN  sgj_users.sgj_org_follow as f ON f.org_id = u.id  LEFT JOIN   sgj_users.sgj_admin as a on a.id = f.admin_user_id  where x.ctime >= ? AND x.ctime<= ? GROUP BY x.org_id",to,ctime).Scan(&patientinfo).Error
+	rows, err := readUserDb.Offset(offset).Limit(limit).Raw("select Count(1) from sgj_users.sgj_user_org as u join sgj_xt.xt_warehouse_info as x on x.org_id = u.id where x.ctime >= ? AND x.ctime <= ?", to, ctime).Rows()
 	if rows.Next() {
 		rows.Scan(&total)
 	}
 
 func GetTodayExitlist(to int64,ctime int64,limit int64,page int64)(patientinfo []function_models.PatientInfo,total int64,err error)  {
 	offset := (page - 1) * limit
-	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
+	err = readUserDb.Raw("select * 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<= ? GROUP BY x.org_id",to,ctime).Scan(&patientinfo).Error
 	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()
 	if rows.Next() {
 		rows.Scan(&total)