XMLWAN 4 years ago
parent
commit
5f377d688e

+ 95 - 113
controllers/new_mobile_api_controllers/common_api_controller.go View File

88
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
88
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
89
 	fmt.Println("err", err)
89
 	fmt.Println("err", err)
90
 	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
90
 	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
91
-	//fmt.Println("大项", inspectionmajor)
91
+
92
 	inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
92
 	inspectionMinor := int64(dataBody["inspectionMinor"].(float64))
93
-	//fmt.Println("小项", inspectionMinor)
93
+
94
 	minrange := dataBody["min_range"].(string)
94
 	minrange := dataBody["min_range"].(string)
95
-	//fmt.Println("minragne", minrange)
95
+
96
 	largerange := dataBody["large_range"].(string)
96
 	largerange := dataBody["large_range"].(string)
97
 	fmt.Println("largerange", largerange)
97
 	fmt.Println("largerange", largerange)
98
 	sort := dataBody["sort"].(string)
98
 	sort := dataBody["sort"].(string)
99
 	sorts, err := strconv.ParseInt(sort, 10, 64)
99
 	sorts, err := strconv.ParseInt(sort, 10, 64)
100
-	//fmt.Println("sort", sort)
100
+
101
 	checktype := int64(dataBody["check_type"].(float64))
101
 	checktype := int64(dataBody["check_type"].(float64))
102
-	//fmt.Println("检查类型", checktype)
102
+
103
 	rangvalue := dataBody["range_value"].(string)
103
 	rangvalue := dataBody["range_value"].(string)
104
-	//fmt.Println("rangvalue", rangvalue)
104
+
105
 	if rangvalue == "0" {
105
 	if rangvalue == "0" {
106
 		rangvalue = ""
106
 		rangvalue = ""
107
 	}
107
 	}
689
 
689
 
690
 func (this *CommonApiController) GetDialysislist() {
690
 func (this *CommonApiController) GetDialysislist() {
691
 	startime := this.GetString("startime")
691
 	startime := this.GetString("startime")
692
-	fmt.Println("startime", startime)
692
+
693
 	endtime := this.GetString("endtime")
693
 	endtime := this.GetString("endtime")
694
-	fmt.Println("enditme", endtime)
695
 
694
 
696
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
695
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
697
 	fmt.Println("parseDateErr", parseDateErr)
696
 	fmt.Println("parseDateErr", parseDateErr)
698
 	statime := startDate.Unix()
697
 	statime := startDate.Unix()
699
-	fmt.Println("开始时间", statime)
698
+
700
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
699
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
701
 
700
 
702
 	entime := endDate.Unix()
701
 	entime := endDate.Unix()
703
-	fmt.Println("开始时间", statime)
702
+
704
 	page, _ := this.GetInt64("page")
703
 	page, _ := this.GetInt64("page")
705
-	fmt.Println("page", page)
704
+
706
 	limit, _ := this.GetInt64("limit")
705
 	limit, _ := this.GetInt64("limit")
707
-	fmt.Println("limit", limit)
706
+
708
 	adminUser := this.GetAdminUserInfo()
707
 	adminUser := this.GetAdminUserInfo()
709
 	orgId := adminUser.CurrentOrgId
708
 	orgId := adminUser.CurrentOrgId
710
 	count, _ := service.TotalDialysisCount(statime, entime, orgId)
709
 	count, _ := service.TotalDialysisCount(statime, entime, orgId)
788
 func (this *CommonApiController) GetPrescritionByName() {
787
 func (this *CommonApiController) GetPrescritionByName() {
789
 	adminUser := this.GetAdminUserInfo()
788
 	adminUser := this.GetAdminUserInfo()
790
 	orgId := adminUser.CurrentOrgId
789
 	orgId := adminUser.CurrentOrgId
791
-	//keyword := this.GetString("keyword")
790
+
792
 	patientid, _ := this.GetInt64("patientid")
791
 	patientid, _ := this.GetInt64("patientid")
793
 	startime := this.GetString("startime")
792
 	startime := this.GetString("startime")
794
 	fmt.Println(startime)
793
 	fmt.Println(startime)
800
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
799
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
801
 
800
 
802
 	entime := endDate.Unix()
801
 	entime := endDate.Unix()
803
-	//fmt.Println("开始时间", statime)
804
-	//fmt.Println(endtime)
802
+
805
 	limit, _ := this.GetInt64("limit")
803
 	limit, _ := this.GetInt64("limit")
806
-	//fmt.Println("limit", limit)
804
+
807
 	page, _ := this.GetInt64("page")
805
 	page, _ := this.GetInt64("page")
808
-	//fmt.Println("page", page)
806
+
809
 	patient, total, err := service.GetPrescritionByName(orgId, patientid, statime, entime, limit, page)
807
 	patient, total, err := service.GetPrescritionByName(orgId, patientid, statime, entime, limit, page)
810
 	if err != nil {
808
 	if err != nil {
811
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
809
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
820
 func (this *CommonApiController) GetStatistics() {
818
 func (this *CommonApiController) GetStatistics() {
821
 	adminUser := this.GetAdminUserInfo()
819
 	adminUser := this.GetAdminUserInfo()
822
 	orgId := adminUser.CurrentOrgId
820
 	orgId := adminUser.CurrentOrgId
823
-	//fmt.Println("orgid", orgId)
821
+
824
 	startime := this.GetString("start_time")
822
 	startime := this.GetString("start_time")
825
-	//fmt.Println(startime)
823
+
826
 	endtime := this.GetString("end_time")
824
 	endtime := this.GetString("end_time")
827
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
825
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
828
 	fmt.Println("parseDateErr", parseDateErr)
826
 	fmt.Println("parseDateErr", parseDateErr)
829
 	statime := startDate.Unix()
827
 	statime := startDate.Unix()
830
-	//fmt.Println("开始时间", statime)
828
+
831
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
829
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
832
 	entime := endDate.Unix()
830
 	entime := endDate.Unix()
833
-	//fmt.Println("结束日期", entime)
831
+
834
 	value, _ := this.GetInt64("value")
832
 	value, _ := this.GetInt64("value")
835
-	//fmt.Println("value", value)
833
+
836
 	limit, _ := this.GetInt64("limit")
834
 	limit, _ := this.GetInt64("limit")
837
-	//fmt.Println("limit", limit)
835
+
838
 	page, _ := this.GetInt64("page")
836
 	page, _ := this.GetInt64("page")
839
-	//fmt.Println("page", page)
837
+
840
 	modeId, _ := this.GetInt64("mode_id")
838
 	modeId, _ := this.GetInt64("mode_id")
841
 	treatinfo, total, err := service.GetTreateInfo(orgId, statime, entime, value, limit, page)
839
 	treatinfo, total, err := service.GetTreateInfo(orgId, statime, entime, value, limit, page)
842
 	statistics, ttd, _ := service.GetStatistics(orgId, statime, entime, modeId)
840
 	statistics, ttd, _ := service.GetStatistics(orgId, statime, entime, modeId)
1071
 	lapseto, _ := this.GetInt64("lapseto")
1069
 	lapseto, _ := this.GetInt64("lapseto")
1072
 	fmt.Println("转归", lapseto)
1070
 	fmt.Println("转归", lapseto)
1073
 	startime := this.GetString("startime")
1071
 	startime := this.GetString("startime")
1074
-	fmt.Println("startime", startime)
1072
+
1075
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
1073
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
1076
 	fmt.Println("parseDateErr", parseDateErr)
1074
 	fmt.Println("parseDateErr", parseDateErr)
1077
 	statime := startDate.Unix()
1075
 	statime := startDate.Unix()
1078
-	fmt.Println("开始时间", statime)
1076
+
1079
 	endtime := this.GetString("endtime")
1077
 	endtime := this.GetString("endtime")
1080
-	fmt.Println("endtime", endtime)
1078
+
1081
 	endTimeYMDHmsStr := endtime + " 23:59:59"
1079
 	endTimeYMDHmsStr := endtime + " 23:59:59"
1082
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
1080
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
1083
 	entime := endDate.Unix()
1081
 	entime := endDate.Unix()
1084
 	fmt.Println("结束日期", entime)
1082
 	fmt.Println("结束日期", entime)
1085
-	//group, parseDateErr := service.GetItemNameGroup(orgid, statime, entime)
1086
-	//quarter, err := service.GetFirstQuarter(orgid, statime, entime)
1087
 	//统计数值类型的数据
1083
 	//统计数值类型的数据
1088
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
1084
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
1089
 	//统计rang_type== 2
1085
 	//统计rang_type== 2
1110
 	endTimeYMDHmsStr := endtime + " 23:59:59"
1106
 	endTimeYMDHmsStr := endtime + " 23:59:59"
1111
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
1107
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
1112
 	entime := endDate.Unix()
1108
 	entime := endDate.Unix()
1113
-	fmt.Println("结束日期", entime)
1109
+
1114
 	adminInfo := this.GetAdminUserInfo()
1110
 	adminInfo := this.GetAdminUserInfo()
1115
 	orgid := adminInfo.CurrentOrgId
1111
 	orgid := adminInfo.CurrentOrgId
1116
-	fmt.Println("orgid", orgid)
1112
+
1117
 	lapseto, _ := this.GetInt64("lapseto")
1113
 	lapseto, _ := this.GetInt64("lapseto")
1118
 	fmt.Println("lapseto", lapseto)
1114
 	fmt.Println("lapseto", lapseto)
1119
 	itemtype, _ := this.GetInt64("itemtype")
1115
 	itemtype, _ := this.GetInt64("itemtype")
1124
 	firstQuarterStart := this.GetString("first_quarter_start")
1120
 	firstQuarterStart := this.GetString("first_quarter_start")
1125
 	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
1121
 	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
1126
 	firstQuarterStartUnix := firstQuarterStartStr.Unix()
1122
 	firstQuarterStartUnix := firstQuarterStartStr.Unix()
1127
-	fmt.Println("第一季度开始时间", firstQuarterStartUnix)
1123
+
1128
 	fisrtQuarterEnd := this.GetString("first_qurter_end")
1124
 	fisrtQuarterEnd := this.GetString("first_qurter_end")
1129
 	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
1125
 	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
1130
 	fisrtQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
1126
 	fisrtQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
1131
 	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
1127
 	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
1132
-	fmt.Println("第一季度结束时间", fisrtQuarterEndStrUnix)
1133
 
1128
 
1134
 	secondeQuarterStart := this.GetString("second_qurter_start")
1129
 	secondeQuarterStart := this.GetString("second_qurter_start")
1135
 	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
1130
 	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
1136
 	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
1131
 	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
1137
-	fmt.Println("第二季度开始时间", secondeQuarterStartUnix)
1132
+
1138
 	secondQuarterEnd := this.GetString("second_qurter_end")
1133
 	secondQuarterEnd := this.GetString("second_qurter_end")
1139
 	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
1134
 	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
1140
 	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
1135
 	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
1144
 	threeQuarterStart := this.GetString("three_qurter_start")
1139
 	threeQuarterStart := this.GetString("three_qurter_start")
1145
 	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
1140
 	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
1146
 	threeQuarterStartUnix := threeQuarterStartStr.Unix()
1141
 	threeQuarterStartUnix := threeQuarterStartStr.Unix()
1147
-	fmt.Println("第三季度开始时间", threeQuarterStartUnix)
1142
+
1148
 	threeQuarterEnd := this.GetString("three_qurter_end")
1143
 	threeQuarterEnd := this.GetString("three_qurter_end")
1149
 	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
1144
 	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
1150
 	threeQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
1145
 	threeQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
1151
 	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
1146
 	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
1152
-	fmt.Println("第三季度结束时间", threeQuarterEndStrUnix)
1153
 
1147
 
1154
 	fourQuarterStart := this.GetString("four_qurter_start")
1148
 	fourQuarterStart := this.GetString("four_qurter_start")
1155
 	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
1149
 	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
1156
 	fourQuarterStartUnix := fourQuarterStartStr.Unix()
1150
 	fourQuarterStartUnix := fourQuarterStartStr.Unix()
1157
-	fmt.Println("第四季度开始时间", fourQuarterStartUnix)
1151
+
1158
 	fourQuarterEnd := this.GetString("four_qurter_end")
1152
 	fourQuarterEnd := this.GetString("four_qurter_end")
1159
 	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
1153
 	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
1160
 	fourQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
1154
 	fourQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
1198
 func (this *CommonApiController) GetMonthProjectList() {
1192
 func (this *CommonApiController) GetMonthProjectList() {
1199
 	adminUser := this.GetAdminUserInfo()
1193
 	adminUser := this.GetAdminUserInfo()
1200
 	orgid := adminUser.CurrentOrgId
1194
 	orgid := adminUser.CurrentOrgId
1201
-	fmt.Println("orgid", orgid)
1202
 
1195
 
1203
 	lapseto, _ := this.GetInt64("lapseto")
1196
 	lapseto, _ := this.GetInt64("lapseto")
1204
 	fmt.Println("lapseto", lapseto)
1197
 	fmt.Println("lapseto", lapseto)
1205
 	itemtype, _ := this.GetInt64("itemtype")
1198
 	itemtype, _ := this.GetInt64("itemtype")
1206
 	fmt.Println("itemtype", itemtype)
1199
 	fmt.Println("itemtype", itemtype)
1207
 	modetype, _ := this.GetInt64("modetype")
1200
 	modetype, _ := this.GetInt64("modetype")
1208
-	fmt.Println("modetype", modetype)
1201
+
1209
 	januaryStart := this.GetString("januaryStart")
1202
 	januaryStart := this.GetString("januaryStart")
1210
-	fmt.Println("一月始", januaryStart)
1203
+
1211
 	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
1204
 	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
1212
 	januaryStartStrUnix := januaryStartStr.Unix()
1205
 	januaryStartStrUnix := januaryStartStr.Unix()
1213
-	fmt.Println("一月使", januaryStartStrUnix)
1206
+
1214
 	januaryEnd := this.GetString("januaryEnd")
1207
 	januaryEnd := this.GetString("januaryEnd")
1215
-	fmt.Println("一月末", januaryEnd)
1208
+
1216
 	januaryEndStr := januaryEnd + " 23:59:59"
1209
 	januaryEndStr := januaryEnd + " 23:59:59"
1217
 	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
1210
 	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
1218
 	januaryEndStrUnix := januaryEndStrs.Unix()
1211
 	januaryEndStrUnix := januaryEndStrs.Unix()
1219
-	fmt.Println("一月末", januaryEndStrUnix)
1220
 
1212
 
1221
 	febStart := this.GetString("febStart")
1213
 	febStart := this.GetString("febStart")
1222
-	fmt.Println("二月始", febStart)
1214
+
1223
 	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
1215
 	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
1224
 	febStartStrStrUnix := febStartStr.Unix()
1216
 	febStartStrStrUnix := febStartStr.Unix()
1225
-	fmt.Println("二月使", febStartStrStrUnix)
1217
+
1226
 	febEnd := this.GetString("febEnd")
1218
 	febEnd := this.GetString("febEnd")
1227
-	fmt.Println("二月末", febEnd)
1219
+
1228
 	febEndStr := febEnd + " 23:59:59"
1220
 	febEndStr := febEnd + " 23:59:59"
1229
 	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
1221
 	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
1230
 	febEndStrUnix := febEndStrs.Unix()
1222
 	febEndStrUnix := febEndStrs.Unix()
1231
-	fmt.Println("二月末", febEndStrUnix)
1232
 
1223
 
1233
 	marchStart := this.GetString("marchStart")
1224
 	marchStart := this.GetString("marchStart")
1234
-	fmt.Println("三月始", marchStart)
1225
+
1235
 	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
1226
 	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
1236
 	marchStartStrUnix := marchStartStr.Unix()
1227
 	marchStartStrUnix := marchStartStr.Unix()
1237
-	fmt.Println("三月使", marchStartStrUnix)
1228
+
1238
 	marchEnd := this.GetString("marchEnd")
1229
 	marchEnd := this.GetString("marchEnd")
1239
-	fmt.Println("三月末", febEnd)
1230
+
1240
 	marchEndStr := marchEnd + " 23:59:59"
1231
 	marchEndStr := marchEnd + " 23:59:59"
1241
 	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
1232
 	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
1242
 	marchEndStrUnix := marchEndStrs.Unix()
1233
 	marchEndStrUnix := marchEndStrs.Unix()
1243
-	fmt.Println("三月末", marchEndStrUnix)
1244
 
1234
 
1245
 	aprStart := this.GetString("aprStart")
1235
 	aprStart := this.GetString("aprStart")
1246
-	fmt.Println("四月始", aprStart)
1236
+
1247
 	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
1237
 	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
1248
 	aprStartStrUnix := aprStartStr.Unix()
1238
 	aprStartStrUnix := aprStartStr.Unix()
1249
-	fmt.Println("四月使", aprStartStrUnix)
1239
+
1250
 	aprEnd := this.GetString("aprEnd")
1240
 	aprEnd := this.GetString("aprEnd")
1251
-	fmt.Println("四月末", aprEnd)
1241
+
1252
 	aprEndStr := aprEnd + " 23:59:59"
1242
 	aprEndStr := aprEnd + " 23:59:59"
1253
 	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
1243
 	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
1254
 	aprEndStrsUnix := aprEndStrs.Unix()
1244
 	aprEndStrsUnix := aprEndStrs.Unix()
1255
-	fmt.Println("四月末", aprEndStrsUnix)
1256
 
1245
 
1257
 	mayStart := this.GetString("mayStart")
1246
 	mayStart := this.GetString("mayStart")
1258
-	fmt.Println("五月始", mayStart)
1247
+
1259
 	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
1248
 	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
1260
 	mayStartStrUnix := mayStartStr.Unix()
1249
 	mayStartStrUnix := mayStartStr.Unix()
1261
-	fmt.Println("五月使", mayStartStrUnix)
1250
+
1262
 	mayEnd := this.GetString("mayEnd")
1251
 	mayEnd := this.GetString("mayEnd")
1263
-	fmt.Println("五月末", mayEnd)
1252
+
1264
 	mayEndStr := mayEnd + " 23:59:59"
1253
 	mayEndStr := mayEnd + " 23:59:59"
1265
 	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
1254
 	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
1266
 	mayEndStrsUnix := mayEndStrs.Unix()
1255
 	mayEndStrsUnix := mayEndStrs.Unix()
1267
-	fmt.Println("五月末", mayEndStrsUnix)
1268
 
1256
 
1269
 	junStart := this.GetString("junStart")
1257
 	junStart := this.GetString("junStart")
1270
-	fmt.Println("六月始", mayStart)
1258
+
1271
 	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
1259
 	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
1272
 	junStartStrUnix := junStartStr.Unix()
1260
 	junStartStrUnix := junStartStr.Unix()
1273
-	fmt.Println("六月使", junStartStrUnix)
1261
+
1274
 	junEnd := this.GetString("junEnd")
1262
 	junEnd := this.GetString("junEnd")
1275
-	fmt.Println("六月末", junEnd)
1263
+
1276
 	junEndStr := junEnd + " 23:59:59"
1264
 	junEndStr := junEnd + " 23:59:59"
1277
 	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
1265
 	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
1278
 	junEndStrsUnix := junEndStrs.Unix()
1266
 	junEndStrsUnix := junEndStrs.Unix()
1279
-	fmt.Println("六月末", junEndStrsUnix)
1280
 
1267
 
1281
 	julStart := this.GetString("julStart")
1268
 	julStart := this.GetString("julStart")
1282
-	fmt.Println("七月始", julStart)
1269
+
1283
 	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
1270
 	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
1284
 	julStartStrUnix := julStartStr.Unix()
1271
 	julStartStrUnix := julStartStr.Unix()
1285
-	fmt.Println("七月使", julStartStrUnix)
1272
+
1286
 	julEnd := this.GetString("julEnd")
1273
 	julEnd := this.GetString("julEnd")
1287
-	fmt.Println("七月末", julEnd)
1274
+
1288
 	julEndStr := julEnd + " 23:59:59"
1275
 	julEndStr := julEnd + " 23:59:59"
1289
 	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
1276
 	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
1290
 	julEndStrsUnix := julEndStrs.Unix()
1277
 	julEndStrsUnix := julEndStrs.Unix()
1291
-	fmt.Println("七月末", julEndStrsUnix)
1292
 
1278
 
1293
 	augStart := this.GetString("augStart")
1279
 	augStart := this.GetString("augStart")
1294
-	fmt.Println("八月始", augStart)
1280
+
1295
 	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
1281
 	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
1296
 	augStartStrUnix := augStartStr.Unix()
1282
 	augStartStrUnix := augStartStr.Unix()
1297
-	fmt.Println("八月使", augStartStrUnix)
1283
+
1298
 	augEnd := this.GetString("augEnd")
1284
 	augEnd := this.GetString("augEnd")
1299
-	fmt.Println("八月末", augEnd)
1285
+
1300
 	augEndStr := augEnd + " 23:59:59"
1286
 	augEndStr := augEnd + " 23:59:59"
1301
 	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
1287
 	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
1302
 	augEndStrsUnix := augEndStrs.Unix()
1288
 	augEndStrsUnix := augEndStrs.Unix()
1303
-	fmt.Println("八月末", augEndStrsUnix)
1304
 
1289
 
1305
 	sepStart := this.GetString("sepStart")
1290
 	sepStart := this.GetString("sepStart")
1306
-	fmt.Println("九月始", sepStart)
1291
+
1307
 	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
1292
 	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
1308
 	sepStartStrUnix := sepStartStr.Unix()
1293
 	sepStartStrUnix := sepStartStr.Unix()
1309
-	fmt.Println("九月使", sepStartStrUnix)
1294
+
1310
 	sepEnd := this.GetString("sepEnd")
1295
 	sepEnd := this.GetString("sepEnd")
1311
-	fmt.Println("九月末", sepEnd)
1296
+
1312
 	sepEndStr := sepEnd + " 23:59:59"
1297
 	sepEndStr := sepEnd + " 23:59:59"
1313
 	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
1298
 	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
1314
 	sepEndStrsUnix := sepEndStrs.Unix()
1299
 	sepEndStrsUnix := sepEndStrs.Unix()
1315
-	fmt.Println("九月末", sepEndStrsUnix)
1316
 
1300
 
1317
 	octStart := this.GetString("octStart")
1301
 	octStart := this.GetString("octStart")
1318
-	fmt.Println("10月始", octStart)
1302
+
1319
 	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
1303
 	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
1320
 	octStartStrUnix := octStartStr.Unix()
1304
 	octStartStrUnix := octStartStr.Unix()
1321
-	fmt.Println("10月使", octStartStrUnix)
1305
+
1322
 	octEnd := this.GetString("octEnd")
1306
 	octEnd := this.GetString("octEnd")
1323
-	fmt.Println("10月末", octEnd)
1307
+
1324
 	octEndStr := octEnd + " 23:59:59"
1308
 	octEndStr := octEnd + " 23:59:59"
1325
 	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
1309
 	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
1326
 	octEndStrsUnix := octEndStrs.Unix()
1310
 	octEndStrsUnix := octEndStrs.Unix()
1327
-	fmt.Println("10月末", octEndStrsUnix)
1328
 
1311
 
1329
 	novStart := this.GetString("novStart")
1312
 	novStart := this.GetString("novStart")
1330
-	fmt.Println("11月始", novStart)
1313
+
1331
 	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
1314
 	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
1332
 	novStartStrUnix := novStartStr.Unix()
1315
 	novStartStrUnix := novStartStr.Unix()
1333
-	fmt.Println("11月使", novStartStrUnix)
1316
+
1334
 	novEnd := this.GetString("novEnd")
1317
 	novEnd := this.GetString("novEnd")
1335
-	fmt.Println("11月末", novEnd)
1318
+
1336
 	novEndStr := novEnd + " 23:59:59"
1319
 	novEndStr := novEnd + " 23:59:59"
1337
 	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
1320
 	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
1338
 	novEndStrsUnix := novEndStrs.Unix()
1321
 	novEndStrsUnix := novEndStrs.Unix()
1339
-	fmt.Println("10月末", novEndStrsUnix)
1340
 
1322
 
1341
 	decStart := this.GetString("decStart")
1323
 	decStart := this.GetString("decStart")
1342
-	fmt.Println("12月始", novStart)
1324
+
1343
 	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
1325
 	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
1344
 	decStartStrUnix := decStartStr.Unix()
1326
 	decStartStrUnix := decStartStr.Unix()
1345
 	fmt.Println("12月使", decStartStrUnix)
1327
 	fmt.Println("12月使", decStartStrUnix)
1346
 	decEnd := this.GetString("decEnd")
1328
 	decEnd := this.GetString("decEnd")
1347
-	fmt.Println("12月末", novEnd)
1329
+
1348
 	decEndStr := decEnd + " 23:59:59"
1330
 	decEndStr := decEnd + " 23:59:59"
1349
 	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
1331
 	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
1350
 	decEndStrsUnix := decEndStrs.Unix()
1332
 	decEndStrsUnix := decEndStrs.Unix()
1351
-	fmt.Println("12月末", decEndStrsUnix)
1333
+
1352
 	rangetype, _ := this.GetInt64("range_type")
1334
 	rangetype, _ := this.GetInt64("range_type")
1353
-	fmt.Println("range_type", rangetype)
1335
+
1354
 	if rangetype == 1 {
1336
 	if rangetype == 1 {
1355
 		//统计总共
1337
 		//统计总共
1356
 		monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
1338
 		monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
1388
 
1370
 
1389
 	adminUser := this.GetAdminUserInfo()
1371
 	adminUser := this.GetAdminUserInfo()
1390
 	orgid := adminUser.CurrentOrgId
1372
 	orgid := adminUser.CurrentOrgId
1391
-	fmt.Println("org", orgid)
1373
+
1392
 	lapstor, _ := this.GetInt64("lapstor")
1374
 	lapstor, _ := this.GetInt64("lapstor")
1393
-	fmt.Println("lapstor", lapstor)
1375
+
1394
 	startime := this.GetString("startime")
1376
 	startime := this.GetString("startime")
1395
-	fmt.Println("开始时间", startime)
1377
+
1396
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
1378
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
1397
 	startimeStrUnix := startimeStr.Unix()
1379
 	startimeStrUnix := startimeStr.Unix()
1398
-	fmt.Println("时间搓", startimeStrUnix)
1380
+
1399
 	endtime := this.GetString("endtime")
1381
 	endtime := this.GetString("endtime")
1400
 	fmt.Println("结束时间", endtime)
1382
 	fmt.Println("结束时间", endtime)
1401
 	endtimeStr := endtime + " 23:59:59"
1383
 	endtimeStr := endtime + " 23:59:59"
1402
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
1384
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
1403
 	endtimeStrsUnix := endtimeStrs.Unix()
1385
 	endtimeStrsUnix := endtimeStrs.Unix()
1404
-	fmt.Println("结束时间搓", endtimeStrsUnix)
1386
+
1405
 	page, _ := this.GetInt64("page")
1387
 	page, _ := this.GetInt64("page")
1406
-	fmt.Println("page", page)
1388
+
1407
 	limit, _ := this.GetInt64("limit")
1389
 	limit, _ := this.GetInt64("limit")
1408
-	fmt.Println("limit", limit)
1390
+
1409
 	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
1391
 	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
1410
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
1392
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
1411
-	fmt.Println("control", control)
1393
+
1412
 	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
1394
 	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
1413
 
1395
 
1414
 	if err != nil {
1396
 	if err != nil {
1427
 func (this *CommonApiController) GetCartogramList() {
1409
 func (this *CommonApiController) GetCartogramList() {
1428
 	adminUser := this.GetAdminUserInfo()
1410
 	adminUser := this.GetAdminUserInfo()
1429
 	orgid := adminUser.CurrentOrgId
1411
 	orgid := adminUser.CurrentOrgId
1430
-	fmt.Println("orgid", orgid)
1412
+	//fmt.Println("orgid", orgid)
1431
 	lapstor, _ := this.GetInt64("lapstor")
1413
 	lapstor, _ := this.GetInt64("lapstor")
1432
 	fmt.Println("lapstor", lapstor)
1414
 	fmt.Println("lapstor", lapstor)
1433
 	startime := this.GetString("startime")
1415
 	startime := this.GetString("startime")
1434
-	fmt.Println("开始时间", startime)
1416
+	//fmt.Println("开始时间", startime)
1435
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
1417
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
1436
 	startimeStrUnix := startimeStr.Unix()
1418
 	startimeStrUnix := startimeStr.Unix()
1437
-	fmt.Println("时间搓", startimeStrUnix)
1419
+	//fmt.Println("时间搓", startimeStrUnix)
1438
 	endtime := this.GetString("endtime")
1420
 	endtime := this.GetString("endtime")
1439
-	fmt.Println("结束时间", endtime)
1421
+	//fmt.Println("结束时间", endtime)
1440
 	endtimeStr := endtime + " 23:59:59"
1422
 	endtimeStr := endtime + " 23:59:59"
1441
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
1423
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
1442
 	endtimeStrsUnix := endtimeStrs.Unix()
1424
 	endtimeStrsUnix := endtimeStrs.Unix()
1443
-	fmt.Println("结束时间搓", endtimeStrsUnix)
1425
+	//fmt.Println("结束时间搓", endtimeStrsUnix)
1444
 	//limit, _ := this.GetInt64("limit")
1426
 	//limit, _ := this.GetInt64("limit")
1445
 	//page, _ := this.GetInt64("page")
1427
 	//page, _ := this.GetInt64("page")
1446
 
1428
 
1447
 	//统计总共
1429
 	//统计总共
1448
 	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
1430
 	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
1449
-	fmt.Println("total=================", total)
1431
+	//fmt.Println("total=================", total)
1450
 	//统计rangetype= 1
1432
 	//统计rangetype= 1
1451
 	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
1433
 	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
1452
-	fmt.Println(standtotal)
1434
+	//fmt.Println(standtotal)
1453
 	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
1435
 	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
1454
-	fmt.Println(standtotalOne)
1436
+	//fmt.Println(standtotalOne)
1455
 	//cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
1437
 	//cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
1456
 	//infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
1438
 	//infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
1457
 	//_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
1439
 	//_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
1476
 	fmt.Println("lapstor", lapstor)
1458
 	fmt.Println("lapstor", lapstor)
1477
 	patientid, _ := this.GetInt64("patientid")
1459
 	patientid, _ := this.GetInt64("patientid")
1478
 	startime := this.GetString("startime")
1460
 	startime := this.GetString("startime")
1479
-	fmt.Println("开始时间", startime)
1461
+
1480
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
1462
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
1481
 	startimeStrUnix := startimeStr.Unix()
1463
 	startimeStrUnix := startimeStr.Unix()
1482
-	fmt.Println("时间搓", startimeStrUnix)
1464
+
1483
 	endtime := this.GetString("endtime")
1465
 	endtime := this.GetString("endtime")
1484
-	fmt.Println("结束时间", endtime)
1466
+	//fmt.Println("结束时间", endtime)
1485
 	endtimeStr := endtime + " 23:59:59"
1467
 	endtimeStr := endtime + " 23:59:59"
1486
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
1468
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
1487
 	endtimeStrsUnix := endtimeStrs.Unix()
1469
 	endtimeStrsUnix := endtimeStrs.Unix()
1488
-	fmt.Println("结束时间搓", endtimeStrsUnix)
1470
+
1489
 	patients, err := service.GetPatientNames(orgid, patientid)
1471
 	patients, err := service.GetPatientNames(orgid, patientid)
1490
 	patientcontorDetail, err := service.GetLastPatientsControlTwo(orgid, patientid, startimeStrUnix, endtimeStrsUnix)
1472
 	patientcontorDetail, err := service.GetLastPatientsControlTwo(orgid, patientid, startimeStrUnix, endtimeStrsUnix)
1491
 	if err != nil {
1473
 	if err != nil {
1506
 	fmt.Println(orgid)
1488
 	fmt.Println(orgid)
1507
 	patientid, _ := this.GetInt64("patientid")
1489
 	patientid, _ := this.GetInt64("patientid")
1508
 	startime, _ := this.GetInt64("startime")
1490
 	startime, _ := this.GetInt64("startime")
1509
-	fmt.Println("startime", startime)
1491
+	//fmt.Println("startime", startime)
1510
 	endtime, _ := this.GetInt64("endtime")
1492
 	endtime, _ := this.GetInt64("endtime")
1511
-	fmt.Println("endtime", endtime)
1493
+	//fmt.Println("endtime", endtime)
1512
 	itemid, _ := this.GetInt64("itemid")
1494
 	itemid, _ := this.GetInt64("itemid")
1513
-	fmt.Println("itemid", itemid)
1495
+	//fmt.Println("itemid", itemid)
1514
 	inspectdate, _ := this.GetInt64("inspectdate")
1496
 	inspectdate, _ := this.GetInt64("inspectdate")
1515
 
1497
 
1516
 	list, err := service.GetQualityControlById(orgid, patientid, startime, endtime, itemid, inspectdate)
1498
 	list, err := service.GetQualityControlById(orgid, patientid, startime, endtime, itemid, inspectdate)
1529
 	adminuser := this.GetAdminUserInfo()
1511
 	adminuser := this.GetAdminUserInfo()
1530
 	orgId := adminuser.CurrentOrgId
1512
 	orgId := adminuser.CurrentOrgId
1531
 	startime := this.GetString("start_time")
1513
 	startime := this.GetString("start_time")
1532
-	fmt.Println(startime)
1514
+
1533
 	endtime := this.GetString("end_time")
1515
 	endtime := this.GetString("end_time")
1534
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
1516
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
1535
 	fmt.Println("parseDateErr", parseDateErr)
1517
 	fmt.Println("parseDateErr", parseDateErr)
1536
 	statime := startDate.Unix()
1518
 	statime := startDate.Unix()
1537
-	fmt.Println("开始时间", statime)
1519
+
1538
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
1520
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
1539
 	entime := endDate.Unix()
1521
 	entime := endDate.Unix()
1540
-	fmt.Println("结束日期", entime)
1522
+
1541
 	value, _ := this.GetInt64("value")
1523
 	value, _ := this.GetInt64("value")
1542
 	fmt.Println("value", value)
1524
 	fmt.Println("value", value)
1543
 
1525
 

+ 147 - 171
controllers/new_mobile_api_controllers/new_common_api_controller.go View File

17
 	timeLayout := "2006-01-02"
17
 	timeLayout := "2006-01-02"
18
 	loc, _ := time.LoadLocation("Local")
18
 	loc, _ := time.LoadLocation("Local")
19
 	startime := this.GetString("startime")
19
 	startime := this.GetString("startime")
20
-	fmt.Println("开始时间", startime)
20
+
21
 	endtime := this.GetString("endtime")
21
 	endtime := this.GetString("endtime")
22
-	fmt.Println("结束时间", endtime)
22
+
23
 	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
23
 	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
24
 	startimes := startTimes.Unix()
24
 	startimes := startTimes.Unix()
25
-	fmt.Println("startime", startimes)
25
+
26
 	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 00:00:00", loc)
26
 	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 00:00:00", loc)
27
 	endtimeData := endtimes.Unix()
27
 	endtimeData := endtimes.Unix()
28
-	fmt.Println("结束日期", endtimeData)
28
+
29
 	adminUser := this.GetMobileAdminUserInfo()
29
 	adminUser := this.GetMobileAdminUserInfo()
30
 	orgid := adminUser.Org.Id
30
 	orgid := adminUser.Org.Id
31
-	fmt.Println("机构ID", orgid)
31
+
32
 	//统计透析总量
32
 	//统计透析总量
33
 	_, total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid)
33
 	_, total, _ := service.GetDialysiTotal(startimes, endtimeData, orgid)
34
 
34
 
45
 
45
 
46
 func (this *NewCommonApiController) GetMobileTotalLapseCount() {
46
 func (this *NewCommonApiController) GetMobileTotalLapseCount() {
47
 	startime, _ := this.GetInt64("startime")
47
 	startime, _ := this.GetInt64("startime")
48
-	fmt.Println("startime", startime)
48
+
49
 	endtime, _ := this.GetInt64("endtime")
49
 	endtime, _ := this.GetInt64("endtime")
50
-	fmt.Println("endtime", endtime)
50
+
51
 	adminUser := this.GetMobileAdminUserInfo()
51
 	adminUser := this.GetMobileAdminUserInfo()
52
 	orgid := adminUser.Org.Id
52
 	orgid := adminUser.Org.Id
53
 	//统计转出的病人
53
 	//统计转出的病人
66
 }
66
 }
67
 
67
 
68
 func (this *NewCommonApiController) GetMobileTotalSexCount() {
68
 func (this *NewCommonApiController) GetMobileTotalSexCount() {
69
-	startime, _ := this.GetInt64("startime")
70
-	fmt.Println("startime", startime)
71
-	endtime, _ := this.GetInt64("endtime")
72
-	fmt.Println("endtime", endtime)
69
+	//startime, _ := this.GetInt64("startime")
70
+	//fmt.Println("startime", startime)
71
+	//endtime, _ := this.GetInt64("endtime")
72
+	//fmt.Println("endtime", endtime)
73
 	adminUser := this.GetMobileAdminUserInfo()
73
 	adminUser := this.GetMobileAdminUserInfo()
74
 	orgid := adminUser.Org.Id
74
 	orgid := adminUser.Org.Id
75
 	total := service.GetPatientTotalCount(orgid)
75
 	total := service.GetPatientTotalCount(orgid)
86
 
86
 
87
 func (this *NewCommonApiController) GetMobileTotalInfectiousCout() {
87
 func (this *NewCommonApiController) GetMobileTotalInfectiousCout() {
88
 	startime, _ := this.GetInt64("startime")
88
 	startime, _ := this.GetInt64("startime")
89
-	//	fmt.Println("startime", startime)
89
+
90
 	endtime, _ := this.GetInt64("endtime")
90
 	endtime, _ := this.GetInt64("endtime")
91
-	fmt.Println("endtime", endtime)
91
+
92
 	adminUser := this.GetMobileAdminUserInfo()
92
 	adminUser := this.GetMobileAdminUserInfo()
93
 	orgid := adminUser.Org.Id
93
 	orgid := adminUser.Org.Id
94
 	//统计透析总人数
94
 	//统计透析总人数
109
 }
109
 }
110
 
110
 
111
 func (this *NewCommonApiController) GetMobileTotalAgeCount() {
111
 func (this *NewCommonApiController) GetMobileTotalAgeCount() {
112
-	startime, _ := this.GetInt64("startime")
113
-	fmt.Println("开始时间", startime)
114
-	endtime, _ := this.GetInt64("endtime")
115
-	fmt.Println("结束时间", endtime)
112
+	//startime, _ := this.GetInt64("startime")
113
+	//
114
+	//endtime, _ := this.GetInt64("endtime")
115
+
116
 	adminUser := this.GetMobileAdminUserInfo()
116
 	adminUser := this.GetMobileAdminUserInfo()
117
 	orgid := adminUser.Org.Id
117
 	orgid := adminUser.Org.Id
118
 	total := service.GetPatientTotalCount(orgid)
118
 	total := service.GetPatientTotalCount(orgid)
129
 }
129
 }
130
 
130
 
131
 func (this *NewCommonApiController) GetMobileTotalDialysisCount() {
131
 func (this *NewCommonApiController) GetMobileTotalDialysisCount() {
132
-	startime, _ := this.GetInt64("startime")
133
-	fmt.Println("开始时间", startime)
134
-	endtime, _ := this.GetInt64("endtime")
135
-	fmt.Println("结束时间", endtime)
132
+	//startime, _ := this.GetInt64("startime")
133
+	//
134
+	//endtime, _ := this.GetInt64("endtime")
135
+
136
 	adminUser := this.GetMobileAdminUserInfo()
136
 	adminUser := this.GetMobileAdminUserInfo()
137
 	orgid := adminUser.Org.Id
137
 	orgid := adminUser.Org.Id
138
 	recordDateStr := time.Now().Format("2006-01-02")
138
 	recordDateStr := time.Now().Format("2006-01-02")
141
 	nowtime := recordDate.Unix()
141
 	nowtime := recordDate.Unix()
142
 	//统计透析总人数
142
 	//统计透析总人数
143
 	total := service.GetPatientTotalCount(orgid)
143
 	total := service.GetPatientTotalCount(orgid)
144
-	fmt.Println("total", total)
145
 	//获取该机构下的所有病人数据
144
 	//获取该机构下的所有病人数据
146
 	ageData, err := service.GetDialysisAgeData(orgid)
145
 	ageData, err := service.GetDialysisAgeData(orgid)
147
 
146
 
172
 func (this *NewCommonApiController) GetPrescriptionlist() {
171
 func (this *NewCommonApiController) GetPrescriptionlist() {
173
 
172
 
174
 	startime := this.GetString("startime")
173
 	startime := this.GetString("startime")
175
-	fmt.Println("startime", startime)
174
+
176
 	endtime := this.GetString("endtime")
175
 	endtime := this.GetString("endtime")
177
-	fmt.Println("enditme", endtime)
178
 
176
 
179
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
177
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
180
 	fmt.Println("parseDateErr", parseDateErr)
178
 	fmt.Println("parseDateErr", parseDateErr)
181
 	statime := startDate.Unix()
179
 	statime := startDate.Unix()
182
-	fmt.Println("开始时间", statime)
180
+
183
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
181
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
184
 	//
182
 	//
185
 	//entime := endDate.Unix()
183
 	//entime := endDate.Unix()
186
 	endtimeStr := endtime + " 23:59:59"
184
 	endtimeStr := endtime + " 23:59:59"
187
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
185
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
188
 	entime := endtimeStrs.Unix()
186
 	entime := endtimeStrs.Unix()
189
-	fmt.Println("开始时间", statime)
187
+
190
 	page, _ := this.GetInt64("page")
188
 	page, _ := this.GetInt64("page")
191
-	fmt.Println("page", page)
189
+
192
 	limit, _ := this.GetInt64("limit")
190
 	limit, _ := this.GetInt64("limit")
193
-	fmt.Println("limit", limit)
191
+
194
 	adminInfo := this.GetMobileAdminUserInfo()
192
 	adminInfo := this.GetMobileAdminUserInfo()
195
 	orgId := adminInfo.Org.Id
193
 	orgId := adminInfo.Org.Id
196
 	count, _ := service.TotalDialysisCount(statime, entime, orgId)
194
 	count, _ := service.TotalDialysisCount(statime, entime, orgId)
212
 	adminUser := this.GetMobileAdminUserInfo()
210
 	adminUser := this.GetMobileAdminUserInfo()
213
 	orgId := adminUser.Org.Id
211
 	orgId := adminUser.Org.Id
214
 	id, _ := this.GetInt64("id")
212
 	id, _ := this.GetInt64("id")
215
-	fmt.Println("id", id)
213
+
216
 	startime := this.GetString("startime")
214
 	startime := this.GetString("startime")
217
-	fmt.Println(startime)
215
+
218
 	endtime := this.GetString("endtime")
216
 	endtime := this.GetString("endtime")
219
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
217
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
220
 	fmt.Println("parseDateErr", parseDateErr)
218
 	fmt.Println("parseDateErr", parseDateErr)
221
 	statime := startDate.Unix()
219
 	statime := startDate.Unix()
222
-	fmt.Println("开始时间", statime)
220
+
223
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
221
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
224
 
222
 
225
 	entime := endDate.Unix()
223
 	entime := endDate.Unix()
226
-	fmt.Println("开始时间", statime)
224
+
227
 	fmt.Println(endtime)
225
 	fmt.Println(endtime)
228
 	limit, _ := this.GetInt64("limit")
226
 	limit, _ := this.GetInt64("limit")
229
-	fmt.Println("limit", limit)
227
+
230
 	page, _ := this.GetInt64("page")
228
 	page, _ := this.GetInt64("page")
231
-	fmt.Println("page", page)
229
+
232
 	patients, total, err := service.GetDialysisDetailById(id, orgId, statime, entime, limit, page)
230
 	patients, total, err := service.GetDialysisDetailById(id, orgId, statime, entime, limit, page)
233
 	if err != nil {
231
 	if err != nil {
234
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
232
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
246
 	//keyword := this.GetString("keyword")
244
 	//keyword := this.GetString("keyword")
247
 	patientid, _ := this.GetInt64("patientid")
245
 	patientid, _ := this.GetInt64("patientid")
248
 	startime := this.GetString("startime")
246
 	startime := this.GetString("startime")
249
-	fmt.Println(startime)
247
+
250
 	endtime := this.GetString("endtime")
248
 	endtime := this.GetString("endtime")
251
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
249
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
252
 	fmt.Println("parseDateErr", parseDateErr)
250
 	fmt.Println("parseDateErr", parseDateErr)
253
 	statime := startDate.Unix()
251
 	statime := startDate.Unix()
254
-	fmt.Println("开始时间", statime)
252
+
255
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
253
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
256
 
254
 
257
 	entime := endDate.Unix()
255
 	entime := endDate.Unix()
258
-	fmt.Println("开始时间", statime)
259
-	fmt.Println(endtime)
256
+
260
 	limit, _ := this.GetInt64("limit")
257
 	limit, _ := this.GetInt64("limit")
261
-	fmt.Println("limit", limit)
258
+
262
 	page, _ := this.GetInt64("page")
259
 	page, _ := this.GetInt64("page")
263
-	fmt.Println("page", page)
260
+
264
 	patient, total, err := service.GetPrescritionByName(orgId, patientid, statime, entime, limit, page)
261
 	patient, total, err := service.GetPrescritionByName(orgId, patientid, statime, entime, limit, page)
265
-	fmt.Println("报错==========", err)
262
+
266
 	if err != nil {
263
 	if err != nil {
267
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
264
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
268
 		return
265
 		return
277
 	adminUser := this.GetMobileAdminUserInfo()
274
 	adminUser := this.GetMobileAdminUserInfo()
278
 	orgId := adminUser.Org.Id
275
 	orgId := adminUser.Org.Id
279
 	startime := this.GetString("startime")
276
 	startime := this.GetString("startime")
280
-	fmt.Println(startime)
277
+
281
 	endtime := this.GetString("endtime")
278
 	endtime := this.GetString("endtime")
282
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
279
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
283
 	fmt.Println("parseDateErr", parseDateErr)
280
 	fmt.Println("parseDateErr", parseDateErr)
284
 	statime := startDate.Unix()
281
 	statime := startDate.Unix()
285
-	fmt.Println("开始时间", statime)
282
+
286
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
283
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
287
 	entime := endDate.Unix()
284
 	entime := endDate.Unix()
288
-	fmt.Println("结束日期", entime)
285
+
289
 	value, _ := this.GetInt64("value")
286
 	value, _ := this.GetInt64("value")
290
-	fmt.Println("value", value)
287
+
291
 	limit, _ := this.GetInt64("limit")
288
 	limit, _ := this.GetInt64("limit")
292
-	fmt.Println("limit", limit)
289
+
293
 	page, _ := this.GetInt64("page")
290
 	page, _ := this.GetInt64("page")
294
-	fmt.Println("page", page)
291
+
295
 	modeId, _ := this.GetInt64("mode_id")
292
 	modeId, _ := this.GetInt64("mode_id")
296
-	fmt.Println("modeId", modeId)
293
+
297
 	treatinfo, total, err := service.GetTreateInfo(orgId, statime, entime, value, limit, page)
294
 	treatinfo, total, err := service.GetTreateInfo(orgId, statime, entime, value, limit, page)
298
 	statistics, ttd, err := service.GetStatistics(orgId, statime, entime, modeId)
295
 	statistics, ttd, err := service.GetStatistics(orgId, statime, entime, modeId)
299
 	if err != nil {
296
 	if err != nil {
312
 	adminUser := this.GetMobileAdminUserInfo()
309
 	adminUser := this.GetMobileAdminUserInfo()
313
 	orgid := adminUser.Org.Id
310
 	orgid := adminUser.Org.Id
314
 	startime := this.GetString("startime")
311
 	startime := this.GetString("startime")
315
-	fmt.Println(startime)
312
+
316
 	endtime := this.GetString("endtime")
313
 	endtime := this.GetString("endtime")
317
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
314
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
318
 	fmt.Println("parseDateErr", parseDateErr)
315
 	fmt.Println("parseDateErr", parseDateErr)
319
 	statime := startDate.Unix()
316
 	statime := startDate.Unix()
320
-	fmt.Println("开始时间", statime)
321
-	//endtimeStr := endtime + " 23:59:59"
322
-	//endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
323
-	//entime := endtimeStrs.Unix()
317
+
324
 	secondQuarterEndStr := endtime + " 23:59:59"
318
 	secondQuarterEndStr := endtime + " 23:59:59"
325
 	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
319
 	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
326
 	entime := secondQuarterEnds.Unix()
320
 	entime := secondQuarterEnds.Unix()
327
-	fmt.Println("结束日期==========", entime)
321
+
328
 	patientid, _ := this.GetInt64("patientid")
322
 	patientid, _ := this.GetInt64("patientid")
329
 	references, err := service.GetInspectionTotalCount(orgid)
323
 	references, err := service.GetInspectionTotalCount(orgid)
330
 	if err != nil {
324
 	if err != nil {
344
 	adminUser := this.GetMobileAdminUserInfo()
338
 	adminUser := this.GetMobileAdminUserInfo()
345
 	orgId := adminUser.Org.Id
339
 	orgId := adminUser.Org.Id
346
 	id, _ := this.GetInt64("id")
340
 	id, _ := this.GetInt64("id")
347
-	fmt.Println("id", id)
341
+
348
 	startime := this.GetString("startime")
342
 	startime := this.GetString("startime")
349
 	endtime := this.GetString("endtime")
343
 	endtime := this.GetString("endtime")
350
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
344
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
351
 	fmt.Println("parseDateErr", parseDateErr)
345
 	fmt.Println("parseDateErr", parseDateErr)
352
 	statime := startDate.Unix()
346
 	statime := startDate.Unix()
353
-	fmt.Println("开始时间", statime)
347
+
354
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
348
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
355
 	//entime := endDate.Unix()
349
 	//entime := endDate.Unix()
356
 	//fmt.Println("结束日期", entime)
350
 	//fmt.Println("结束日期", entime)
378
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
372
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
379
 	fmt.Println("parseDateErr", parseDateErr)
373
 	fmt.Println("parseDateErr", parseDateErr)
380
 	statime := startDate.Unix()
374
 	statime := startDate.Unix()
381
-	fmt.Println("开始时间", statime)
375
+
382
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
376
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
383
 	//entime := endDate.Unix()
377
 	//entime := endDate.Unix()
384
 	//fmt.Println("结束日期", entime)
378
 	//fmt.Println("结束日期", entime)
401
 	orgid := adminInfo.Org.Id
395
 	orgid := adminInfo.Org.Id
402
 	//获取系统数据
396
 	//获取系统数据
403
 	normdata, err := service.GetNormDataByOrgId(orgid)
397
 	normdata, err := service.GetNormDataByOrgId(orgid)
404
-	if len(normdata) == 0 {
405
-		normdata, err := service.GetNormData(0)
406
-		if err != nil {
407
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
408
-			return
409
-		}
410
-		this.ServeSuccessJSON(map[string]interface{}{
411
-			"normdata": normdata,
412
-		})
413
-	}
398
+	//if len(normdata) == 0 {
399
+	//	normdata, err := service.GetNormData(0)
400
+	//	if err != nil {
401
+	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
402
+	//		return
403
+	//	}
404
+	//	this.ServeSuccessJSON(map[string]interface{}{
405
+	//		"normdata": normdata,
406
+	//	})
407
+	//}
414
 	if err != nil {
408
 	if err != nil {
415
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
409
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
416
 		return
410
 		return
435
 	firstQuarterStart := this.GetString("first_quarter_start")
429
 	firstQuarterStart := this.GetString("first_quarter_start")
436
 	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
430
 	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
437
 	firstQuarterStartUnix := firstQuarterStartStr.Unix()
431
 	firstQuarterStartUnix := firstQuarterStartStr.Unix()
438
-	fmt.Println("第一季度开始时间", firstQuarterStartUnix)
432
+
439
 	fisrtQuarterEnd := this.GetString("first_qurter_end")
433
 	fisrtQuarterEnd := this.GetString("first_qurter_end")
440
 	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
434
 	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
441
 	fisrtQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
435
 	fisrtQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
442
 	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
436
 	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
443
-	fmt.Println("第一季度结束时间", fisrtQuarterEndStrUnix)
444
 
437
 
445
 	secondeQuarterStart := this.GetString("second_qurter_start")
438
 	secondeQuarterStart := this.GetString("second_qurter_start")
446
 	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
439
 	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
447
 	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
440
 	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
448
-	fmt.Println("第二季度开始时间", secondeQuarterStartUnix)
441
+
449
 	secondQuarterEnd := this.GetString("second_qurter_end")
442
 	secondQuarterEnd := this.GetString("second_qurter_end")
450
 	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
443
 	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
451
 	secondQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
444
 	secondQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
452
 	secondQuarterEndStrUnix := secondQuarterEnds.Unix()
445
 	secondQuarterEndStrUnix := secondQuarterEnds.Unix()
453
-	fmt.Println("第二季度结束时间", secondQuarterEndStrUnix)
454
 
446
 
455
 	threeQuarterStart := this.GetString("three_qurter_start")
447
 	threeQuarterStart := this.GetString("three_qurter_start")
456
 	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
448
 	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
457
 	threeQuarterStartUnix := threeQuarterStartStr.Unix()
449
 	threeQuarterStartUnix := threeQuarterStartStr.Unix()
458
-	fmt.Println("第三季度开始时间", threeQuarterStartUnix)
450
+
459
 	threeQuarterEnd := this.GetString("three_qurter_end")
451
 	threeQuarterEnd := this.GetString("three_qurter_end")
460
 	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
452
 	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
461
 	threeQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
453
 	threeQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
462
 	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
454
 	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
463
-	fmt.Println("第三季度结束时间", threeQuarterEndStrUnix)
464
 
455
 
465
 	fourQuarterStart := this.GetString("four_qurter_start")
456
 	fourQuarterStart := this.GetString("four_qurter_start")
466
 	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
457
 	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
467
 	fourQuarterStartUnix := fourQuarterStartStr.Unix()
458
 	fourQuarterStartUnix := fourQuarterStartStr.Unix()
468
-	fmt.Println("第四季度开始时间", fourQuarterStartUnix)
459
+
469
 	fourQuarterEnd := this.GetString("four_qurter_end")
460
 	fourQuarterEnd := this.GetString("four_qurter_end")
470
 	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
461
 	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
471
 	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
462
 	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
487
 			"list":      list,
478
 			"list":      list,
488
 			"standList": standList,
479
 			"standList": standList,
489
 		})
480
 		})
481
+		return
490
 	}
482
 	}
491
 
483
 
492
 	if rangetype == 2 {
484
 	if rangetype == 2 {
502
 			"list":      list,
494
 			"list":      list,
503
 			"standList": standList,
495
 			"standList": standList,
504
 		})
496
 		})
497
+		return
505
 	}
498
 	}
506
 }
499
 }
507
 
500
 
512
 	lapseto, _ := this.GetInt64("lapseto")
505
 	lapseto, _ := this.GetInt64("lapseto")
513
 	fmt.Println("转归", lapseto)
506
 	fmt.Println("转归", lapseto)
514
 	startime := this.GetString("startime")
507
 	startime := this.GetString("startime")
515
-	fmt.Println("startime", startime)
508
+
516
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
509
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
517
 	fmt.Println("parseDateErr", parseDateErr)
510
 	fmt.Println("parseDateErr", parseDateErr)
518
 	statime := startDate.Unix()
511
 	statime := startDate.Unix()
519
-	//fmt.Println("开始时间", statime)
512
+
520
 	endtime := this.GetString("endtime")
513
 	endtime := this.GetString("endtime")
521
-	fmt.Println("endtime", endtime)
514
+
522
 	endTimeYMDHmsStr := endtime + " 23:59:59"
515
 	endTimeYMDHmsStr := endtime + " 23:59:59"
523
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
516
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
524
 	entime := endDate.Unix()
517
 	entime := endDate.Unix()
525
-	fmt.Println("结束日期", entime)
518
+
526
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
519
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
527
 	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
520
 	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
528
 	if err != nil {
521
 	if err != nil {
539
 	adminInfo := this.GetMobileAdminUserInfo()
532
 	adminInfo := this.GetMobileAdminUserInfo()
540
 	orgid := adminInfo.Org.Id
533
 	orgid := adminInfo.Org.Id
541
 	lapseto, _ := this.GetInt64("lapseto")
534
 	lapseto, _ := this.GetInt64("lapseto")
542
-	fmt.Println("lapseto", lapseto)
535
+
543
 	itemtype, _ := this.GetInt64("itemtype")
536
 	itemtype, _ := this.GetInt64("itemtype")
544
 	fmt.Println("itemtype", itemtype)
537
 	fmt.Println("itemtype", itemtype)
545
 	modetype, _ := this.GetInt64("modeltype")
538
 	modetype, _ := this.GetInt64("modeltype")
546
-	fmt.Println("modetype", modetype)
539
+
547
 	januaryStart := this.GetString("januaryStart")
540
 	januaryStart := this.GetString("januaryStart")
548
-	fmt.Println("一月始", januaryStart)
541
+
549
 	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
542
 	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
550
 	januaryStartStrUnix := januaryStartStr.Unix()
543
 	januaryStartStrUnix := januaryStartStr.Unix()
551
-	fmt.Println("一月使", januaryStartStrUnix)
544
+
552
 	januaryEnd := this.GetString("januaryEnd")
545
 	januaryEnd := this.GetString("januaryEnd")
553
-	fmt.Println("一月末", januaryEnd)
546
+
554
 	januaryEndStr := januaryEnd + " 23:59:59"
547
 	januaryEndStr := januaryEnd + " 23:59:59"
555
 	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
548
 	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
556
 	januaryEndStrUnix := januaryEndStrs.Unix()
549
 	januaryEndStrUnix := januaryEndStrs.Unix()
557
-	fmt.Println("一月末", januaryEndStrUnix)
558
 
550
 
559
 	febStart := this.GetString("febStart")
551
 	febStart := this.GetString("febStart")
560
-	fmt.Println("二月始", febStart)
552
+
561
 	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
553
 	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
562
 	febStartStrStrUnix := febStartStr.Unix()
554
 	febStartStrStrUnix := febStartStr.Unix()
563
-	fmt.Println("二月使", febStartStrStrUnix)
555
+
564
 	febEnd := this.GetString("febEnd")
556
 	febEnd := this.GetString("febEnd")
565
-	fmt.Println("二月末", febEnd)
557
+
566
 	febEndStr := febEnd + " 23:59:59"
558
 	febEndStr := febEnd + " 23:59:59"
567
 	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
559
 	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
568
 	febEndStrUnix := febEndStrs.Unix()
560
 	febEndStrUnix := febEndStrs.Unix()
569
-	fmt.Println("二月末", febEndStrUnix)
570
 
561
 
571
 	marchStart := this.GetString("marchStart")
562
 	marchStart := this.GetString("marchStart")
572
-	fmt.Println("三月始", marchStart)
563
+
573
 	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
564
 	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
574
 	marchStartStrUnix := marchStartStr.Unix()
565
 	marchStartStrUnix := marchStartStr.Unix()
575
-	fmt.Println("三月使", marchStartStrUnix)
566
+
576
 	marchEnd := this.GetString("marchEnd")
567
 	marchEnd := this.GetString("marchEnd")
577
-	fmt.Println("三月末", febEnd)
568
+
578
 	marchEndStr := marchEnd + " 23:59:59"
569
 	marchEndStr := marchEnd + " 23:59:59"
579
 	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
570
 	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
580
 	marchEndStrUnix := marchEndStrs.Unix()
571
 	marchEndStrUnix := marchEndStrs.Unix()
581
-	fmt.Println("三月末", marchEndStrUnix)
582
 
572
 
583
 	aprStart := this.GetString("aprStart")
573
 	aprStart := this.GetString("aprStart")
584
-	fmt.Println("四月始", aprStart)
574
+
585
 	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
575
 	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
586
 	aprStartStrUnix := aprStartStr.Unix()
576
 	aprStartStrUnix := aprStartStr.Unix()
587
-	fmt.Println("四月使", aprStartStrUnix)
577
+
588
 	aprEnd := this.GetString("aprEnd")
578
 	aprEnd := this.GetString("aprEnd")
589
-	fmt.Println("四月末", aprEnd)
579
+
590
 	aprEndStr := aprEnd + " 23:59:59"
580
 	aprEndStr := aprEnd + " 23:59:59"
591
 	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
581
 	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
592
 	aprEndStrsUnix := aprEndStrs.Unix()
582
 	aprEndStrsUnix := aprEndStrs.Unix()
593
-	fmt.Println("四月末", aprEndStrsUnix)
594
 
583
 
595
 	mayStart := this.GetString("mayStart")
584
 	mayStart := this.GetString("mayStart")
596
-	fmt.Println("五月始", mayStart)
585
+
597
 	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
586
 	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
598
 	mayStartStrUnix := mayStartStr.Unix()
587
 	mayStartStrUnix := mayStartStr.Unix()
599
-	fmt.Println("五月使", mayStartStrUnix)
588
+
600
 	mayEnd := this.GetString("mayEnd")
589
 	mayEnd := this.GetString("mayEnd")
601
-	fmt.Println("五月末", mayEnd)
590
+
602
 	mayEndStr := mayEnd + " 23:59:59"
591
 	mayEndStr := mayEnd + " 23:59:59"
603
 	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
592
 	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
604
 	mayEndStrsUnix := mayEndStrs.Unix()
593
 	mayEndStrsUnix := mayEndStrs.Unix()
605
-	fmt.Println("五月末", mayEndStrsUnix)
606
 
594
 
607
 	junStart := this.GetString("junStart")
595
 	junStart := this.GetString("junStart")
608
-	fmt.Println("六月始", mayStart)
596
+
609
 	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
597
 	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
610
 	junStartStrUnix := junStartStr.Unix()
598
 	junStartStrUnix := junStartStr.Unix()
611
-	fmt.Println("六月使", junStartStrUnix)
599
+
612
 	junEnd := this.GetString("junEnd")
600
 	junEnd := this.GetString("junEnd")
613
-	fmt.Println("六月末", junEnd)
601
+
614
 	junEndStr := junEnd + " 23:59:59"
602
 	junEndStr := junEnd + " 23:59:59"
615
 	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
603
 	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
616
 	junEndStrsUnix := junEndStrs.Unix()
604
 	junEndStrsUnix := junEndStrs.Unix()
617
-	fmt.Println("六月末", junEndStrsUnix)
618
 
605
 
619
 	julStart := this.GetString("julStart")
606
 	julStart := this.GetString("julStart")
620
-	fmt.Println("七月始", julStart)
607
+
621
 	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
608
 	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
622
 	julStartStrUnix := julStartStr.Unix()
609
 	julStartStrUnix := julStartStr.Unix()
623
-	fmt.Println("七月使", julStartStrUnix)
610
+
624
 	julEnd := this.GetString("julEnd")
611
 	julEnd := this.GetString("julEnd")
625
-	fmt.Println("七月末", julEnd)
612
+
626
 	julEndStr := julEnd + " 23:59:59"
613
 	julEndStr := julEnd + " 23:59:59"
627
 	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
614
 	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
628
 	julEndStrsUnix := julEndStrs.Unix()
615
 	julEndStrsUnix := julEndStrs.Unix()
629
-	fmt.Println("七月末", julEndStrsUnix)
630
 
616
 
631
 	augStart := this.GetString("augStart")
617
 	augStart := this.GetString("augStart")
632
-	fmt.Println("八月始", augStart)
618
+
633
 	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
619
 	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
634
 	augStartStrUnix := augStartStr.Unix()
620
 	augStartStrUnix := augStartStr.Unix()
635
-	fmt.Println("八月使", augStartStrUnix)
621
+
636
 	augEnd := this.GetString("augEnd")
622
 	augEnd := this.GetString("augEnd")
637
-	fmt.Println("八月末", augEnd)
623
+
638
 	augEndStr := augEnd + " 23:59:59"
624
 	augEndStr := augEnd + " 23:59:59"
639
 	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
625
 	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
640
 	augEndStrsUnix := augEndStrs.Unix()
626
 	augEndStrsUnix := augEndStrs.Unix()
641
-	fmt.Println("八月末", augEndStrsUnix)
642
 
627
 
643
 	sepStart := this.GetString("sepStart")
628
 	sepStart := this.GetString("sepStart")
644
-	fmt.Println("九月始", sepStart)
629
+
645
 	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
630
 	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
646
 	sepStartStrUnix := sepStartStr.Unix()
631
 	sepStartStrUnix := sepStartStr.Unix()
647
 	fmt.Println("九月使", sepStartStrUnix)
632
 	fmt.Println("九月使", sepStartStrUnix)
648
 	sepEnd := this.GetString("sepEnd")
633
 	sepEnd := this.GetString("sepEnd")
649
-	fmt.Println("九月末", sepEnd)
634
+
650
 	sepEndStr := sepEnd + " 23:59:59"
635
 	sepEndStr := sepEnd + " 23:59:59"
651
 	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
636
 	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
652
 	sepEndStrsUnix := sepEndStrs.Unix()
637
 	sepEndStrsUnix := sepEndStrs.Unix()
653
-	fmt.Println("九月末", sepEndStrsUnix)
654
 
638
 
655
 	octStart := this.GetString("octStart")
639
 	octStart := this.GetString("octStart")
656
-	fmt.Println("10月始", octStart)
640
+
657
 	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
641
 	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
658
 	octStartStrUnix := octStartStr.Unix()
642
 	octStartStrUnix := octStartStr.Unix()
659
-	fmt.Println("10月使", octStartStrUnix)
643
+
660
 	octEnd := this.GetString("octEnd")
644
 	octEnd := this.GetString("octEnd")
661
-	fmt.Println("10月末", octEnd)
645
+
662
 	octEndStr := octEnd + " 23:59:59"
646
 	octEndStr := octEnd + " 23:59:59"
663
 	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
647
 	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
664
 	octEndStrsUnix := octEndStrs.Unix()
648
 	octEndStrsUnix := octEndStrs.Unix()
665
-	fmt.Println("10月末", octEndStrsUnix)
666
 
649
 
667
 	novStart := this.GetString("novStart")
650
 	novStart := this.GetString("novStart")
668
-	fmt.Println("11月始", novStart)
651
+	//fmt.Println("11月始", novStart)
669
 	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
652
 	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
670
 	novStartStrUnix := novStartStr.Unix()
653
 	novStartStrUnix := novStartStr.Unix()
671
-	fmt.Println("11月使", novStartStrUnix)
654
+
672
 	novEnd := this.GetString("novEnd")
655
 	novEnd := this.GetString("novEnd")
673
-	fmt.Println("11月末", novEnd)
656
+
674
 	novEndStr := novEnd + " 23:59:59"
657
 	novEndStr := novEnd + " 23:59:59"
675
 	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
658
 	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
676
 	novEndStrsUnix := novEndStrs.Unix()
659
 	novEndStrsUnix := novEndStrs.Unix()
677
-	fmt.Println("10月末", novEndStrsUnix)
678
 
660
 
679
 	decStart := this.GetString("decStart")
661
 	decStart := this.GetString("decStart")
680
-	fmt.Println("12月始", novStart)
662
+
681
 	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
663
 	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
682
 	decStartStrUnix := decStartStr.Unix()
664
 	decStartStrUnix := decStartStr.Unix()
683
-	fmt.Println("12月使", decStartStrUnix)
665
+
684
 	decEnd := this.GetString("decEnd")
666
 	decEnd := this.GetString("decEnd")
685
-	fmt.Println("12月末", novEnd)
667
+
686
 	decEndStr := decEnd + " 23:59:59"
668
 	decEndStr := decEnd + " 23:59:59"
687
 	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
669
 	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
688
 	decEndStrsUnix := decEndStrs.Unix()
670
 	decEndStrsUnix := decEndStrs.Unix()
689
-	fmt.Println("12月末", decEndStrsUnix)
671
+
690
 	range_type, _ := this.GetInt64("range_type")
672
 	range_type, _ := this.GetInt64("range_type")
691
 	if range_type == 1 {
673
 	if range_type == 1 {
692
 		//统计总共
674
 		//统计总共
753
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
735
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
754
 	fmt.Println("parseDateErr", parseDateErr)
736
 	fmt.Println("parseDateErr", parseDateErr)
755
 	statime := startDate.Unix()
737
 	statime := startDate.Unix()
756
-	fmt.Println("开始时间", statime)
738
+	//fmt.Println("开始时间", statime)
757
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
739
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
758
 	//entime := endDate.Unix()
740
 	//entime := endDate.Unix()
759
 	//fmt.Println("结束日期", entime)
741
 	//fmt.Println("结束日期", entime)
763
 	limit, _ := this.GetInt64("limit")
745
 	limit, _ := this.GetInt64("limit")
764
 	//fmt.Println("limit", limit)
746
 	//fmt.Println("limit", limit)
765
 	page, _ := this.GetInt64("page")
747
 	page, _ := this.GetInt64("page")
766
-	fmt.Println("page", page)
748
+	//fmt.Println("page", page)
767
 	patientInfo, total, err := service.GetPatientListData(orgid, statime, entime, limit, page)
749
 	patientInfo, total, err := service.GetPatientListData(orgid, statime, entime, limit, page)
768
 	info, _ := service.GetPatientListInfo(orgid, statime, entime, limit, page)
750
 	info, _ := service.GetPatientListInfo(orgid, statime, entime, limit, page)
769
 	if err != nil {
751
 	if err != nil {
787
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
769
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
788
 	fmt.Println("parseDateErr", parseDateErr)
770
 	fmt.Println("parseDateErr", parseDateErr)
789
 	statime := startDate.Unix()
771
 	statime := startDate.Unix()
790
-	fmt.Println("开始时间", statime)
772
+	//fmt.Println("开始时间", statime)
791
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
773
 	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
792
 	//entime := endDate.Unix()
774
 	//entime := endDate.Unix()
793
 	//fmt.Println("结束日期", entime)
775
 	//fmt.Println("结束日期", entime)
808
 	adminInfo := this.GetMobileAdminUserInfo()
790
 	adminInfo := this.GetMobileAdminUserInfo()
809
 	orgid := adminInfo.Org.Id
791
 	orgid := adminInfo.Org.Id
810
 	lapstor, _ := this.GetInt64("lapstor")
792
 	lapstor, _ := this.GetInt64("lapstor")
811
-	fmt.Println("lapstor", lapstor)
793
+	//fmt.Println("lapstor", lapstor)
812
 	startime := this.GetString("startime")
794
 	startime := this.GetString("startime")
813
-	fmt.Println("开始时间", startime)
795
+
814
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
796
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
815
 	startimeStrUnix := startimeStr.Unix()
797
 	startimeStrUnix := startimeStr.Unix()
816
-	fmt.Println("时间搓", startimeStrUnix)
798
+
817
 	endtime := this.GetString("endtime")
799
 	endtime := this.GetString("endtime")
818
-	fmt.Println("结束时间", endtime)
800
+
819
 	endtimeStr := endtime + " 23:59:59"
801
 	endtimeStr := endtime + " 23:59:59"
820
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
802
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
821
 	endtimeStrsUnix := endtimeStrs.Unix()
803
 	endtimeStrsUnix := endtimeStrs.Unix()
822
-	fmt.Println("结束时间搓", endtimeStrsUnix)
804
+
823
 	page, _ := this.GetInt64("page")
805
 	page, _ := this.GetInt64("page")
824
-	fmt.Println("page", page)
806
+
825
 	limit, _ := this.GetInt64("limit")
807
 	limit, _ := this.GetInt64("limit")
826
-	fmt.Println("limit", limit)
808
+
827
 	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
809
 	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
828
 
810
 
829
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
811
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
846
 func (this *NewCommonApiController) GetMobileCartogramlist() {
828
 func (this *NewCommonApiController) GetMobileCartogramlist() {
847
 	adminInfo := this.GetMobileAdminUserInfo()
829
 	adminInfo := this.GetMobileAdminUserInfo()
848
 	orgid := adminInfo.Org.Id
830
 	orgid := adminInfo.Org.Id
849
-	lapstor, _ := this.GetInt64("lapstor")
850
-	fmt.Println("lapstor", lapstor)
831
+	//lapstor, _ := this.GetInt64("lapstor")
832
+	//fmt.Println("lapstor", lapstor)
851
 	startime := this.GetString("startime")
833
 	startime := this.GetString("startime")
852
-	fmt.Println("开始时间", startime)
834
+
853
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
835
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
854
 	startimeStrUnix := startimeStr.Unix()
836
 	startimeStrUnix := startimeStr.Unix()
855
-	fmt.Println("时间搓", startimeStrUnix)
837
+
856
 	endtime := this.GetString("endtime")
838
 	endtime := this.GetString("endtime")
857
-	fmt.Println("结束时间", endtime)
839
+
858
 	endtimeStr := endtime + " 23:59:59"
840
 	endtimeStr := endtime + " 23:59:59"
859
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
841
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
860
 	endtimeStrsUnix := endtimeStrs.Unix()
842
 	endtimeStrsUnix := endtimeStrs.Unix()
861
 	fmt.Println("结束时间搓", endtimeStrsUnix)
843
 	fmt.Println("结束时间搓", endtimeStrsUnix)
862
 	//统计总共
844
 	//统计总共
863
 	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
845
 	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
864
-	fmt.Println("total=================", total)
865
-	//统计rangetype= 1
846
+
866
 	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
847
 	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
867
-	fmt.Println(standtotal)
848
+
868
 	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
849
 	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
869
-	fmt.Println(standtotalOne)
870
-	//limit, _ := this.GetInt64("limit")
871
-	//page, _ := this.GetInt64("page")
872
-	//cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
873
-	//_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
874
-	//infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
850
+
875
 	if err != nil {
851
 	if err != nil {
876
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
852
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
877
 		return
853
 		return
887
 func (this *NewCommonApiController) GetMobileQualityControl() {
863
 func (this *NewCommonApiController) GetMobileQualityControl() {
888
 	adminInfo := this.GetMobileAdminUserInfo()
864
 	adminInfo := this.GetMobileAdminUserInfo()
889
 	orgid := adminInfo.Org.Id
865
 	orgid := adminInfo.Org.Id
890
-	fmt.Println("orgd", orgid)
866
+
891
 	patientid, _ := this.GetInt64("patientid")
867
 	patientid, _ := this.GetInt64("patientid")
892
-	fmt.Println("patientid", patientid)
868
+
893
 	startime, _ := this.GetInt64("startime")
869
 	startime, _ := this.GetInt64("startime")
894
-	fmt.Println("startime", startime)
870
+
895
 	endtime, _ := this.GetInt64("endtime")
871
 	endtime, _ := this.GetInt64("endtime")
896
-	fmt.Println("endtime", endtime)
872
+
897
 	itemid, _ := this.GetInt64("itemid")
873
 	itemid, _ := this.GetInt64("itemid")
898
-	fmt.Println("itemid", itemid)
874
+
899
 	inspectdate, _ := this.GetInt64("inspectdate")
875
 	inspectdate, _ := this.GetInt64("inspectdate")
900
 	list, err := service.GetQualityControlById(orgid, patientid, startime, endtime, itemid, inspectdate)
876
 	list, err := service.GetQualityControlById(orgid, patientid, startime, endtime, itemid, inspectdate)
901
 	if err != nil {
877
 	if err != nil {
912
 func (this *NewCommonApiController) GetSeachPatientsControl() {
888
 func (this *NewCommonApiController) GetSeachPatientsControl() {
913
 	adminUser := this.GetMobileAdminUserInfo()
889
 	adminUser := this.GetMobileAdminUserInfo()
914
 	orgid := adminUser.Org.Id
890
 	orgid := adminUser.Org.Id
915
-	fmt.Println("orgid", orgid)
891
+
916
 	id, _ := this.GetInt64("id")
892
 	id, _ := this.GetInt64("id")
917
-	fmt.Println("id", id)
893
+
918
 	startime := this.GetString("startime")
894
 	startime := this.GetString("startime")
919
-	fmt.Println("开始时间", startime)
895
+
920
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
896
 	startimeStr, _ := utils.ParseTimeStringToTime("2006-01-02", startime)
921
 	startimeStrUnix := startimeStr.Unix()
897
 	startimeStrUnix := startimeStr.Unix()
922
-	fmt.Println("时间搓", startimeStrUnix)
898
+
923
 	endtime := this.GetString("endtime")
899
 	endtime := this.GetString("endtime")
924
-	fmt.Println("结束时间", endtime)
900
+
925
 	endtimeStr := endtime + " 23:59:59"
901
 	endtimeStr := endtime + " 23:59:59"
926
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
902
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
927
 	endtimeStrsUnix := endtimeStrs.Unix()
903
 	endtimeStrsUnix := endtimeStrs.Unix()
928
-	fmt.Println("结束时间搓", endtimeStrsUnix)
904
+
929
 	control, err := service.GetLastPatientsControlTwo(orgid, id, startimeStrUnix, endtimeStrsUnix)
905
 	control, err := service.GetLastPatientsControlTwo(orgid, id, startimeStrUnix, endtimeStrsUnix)
930
 
906
 
931
 	if err != nil {
907
 	if err != nil {
942
 	adminUser := this.GetMobileAdminUserInfo()
918
 	adminUser := this.GetMobileAdminUserInfo()
943
 	orgId := adminUser.Org.Id
919
 	orgId := adminUser.Org.Id
944
 	startime := this.GetString("startime")
920
 	startime := this.GetString("startime")
945
-	fmt.Println(startime)
921
+
946
 	endtime := this.GetString("endtime")
922
 	endtime := this.GetString("endtime")
947
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
923
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
948
 	fmt.Println("parseDateErr", parseDateErr)
924
 	fmt.Println("parseDateErr", parseDateErr)
949
 	statime := startDate.Unix()
925
 	statime := startDate.Unix()
950
-	fmt.Println("开始时间", statime)
926
+
951
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
927
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
952
 	entime := endDate.Unix()
928
 	entime := endDate.Unix()
953
-	fmt.Println("结束日期", entime)
929
+
954
 	value, _ := this.GetInt64("value")
930
 	value, _ := this.GetInt64("value")
955
-	fmt.Println("value", value)
931
+
956
 	list, err := service.GetTreatList(orgId, statime, entime, value)
932
 	list, err := service.GetTreatList(orgId, statime, entime, value)
957
 	if err != nil {
933
 	if err != nil {
958
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
934
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
968
 func (this *NewCommonApiController) GetPatientComplianceDetail() {
944
 func (this *NewCommonApiController) GetPatientComplianceDetail() {
969
 	adminInfo := this.GetMobileAdminUserInfo()
945
 	adminInfo := this.GetMobileAdminUserInfo()
970
 	orgid := adminInfo.Org.Id
946
 	orgid := adminInfo.Org.Id
971
-	fmt.Println("orgd", orgid)
947
+
972
 	patientid, _ := this.GetInt64("patientid")
948
 	patientid, _ := this.GetInt64("patientid")
973
-	fmt.Println("patientid", patientid)
949
+
974
 	startime, _ := this.GetInt64("startime")
950
 	startime, _ := this.GetInt64("startime")
975
-	fmt.Println("startime", startime)
951
+
976
 	endtime, _ := this.GetInt64("endtime")
952
 	endtime, _ := this.GetInt64("endtime")
977
-	fmt.Println("endtime", endtime)
953
+
978
 	itemid, _ := this.GetInt64("itemid")
954
 	itemid, _ := this.GetInt64("itemid")
979
-	fmt.Println("itemid", itemid)
955
+
980
 	list, err := service.GetPatientComplianceDetail(orgid, patientid, startime, endtime, itemid)
956
 	list, err := service.GetPatientComplianceDetail(orgid, patientid, startime, endtime, itemid)
981
 	if err != nil {
957
 	if err != nil {
982
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
958
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)