28169 2 лет назад
Родитель
Сommit
8e3aad9dbd

+ 4 - 0
controllers/his_api_controller.go Просмотреть файл

4536
 				fmt.Println(err)
4536
 				fmt.Println(err)
4537
 			}
4537
 			}
4538
 
4538
 
4539
+		} else {
4540
+			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
4541
+			fmt.Println(err)
4542
+
4539
 		}
4543
 		}
4540
 	}
4544
 	}
4541
 
4545
 

+ 36 - 36
controllers/manage_api_controller.go Просмотреть файл

4495
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4495
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4496
 		return
4496
 		return
4497
 	}
4497
 	}
4498
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
4498
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
4499
 
4499
 
4500
 	first_end_time := dataBody["first_end_time"].(string)
4500
 	first_end_time := dataBody["first_end_time"].(string)
4501
 
4501
 
4503
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4503
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4504
 		return
4504
 		return
4505
 	}
4505
 	}
4506
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
4506
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
4507
 
4507
 
4508
 	first_total_time := dataBody["first_total_time"].(string)
4508
 	first_total_time := dataBody["first_total_time"].(string)
4509
 
4509
 
4523
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4523
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4524
 		return
4524
 		return
4525
 	}
4525
 	}
4526
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
4526
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
4527
 
4527
 
4528
 	sencond_end_time := dataBody["sencond_end_time"].(string)
4528
 	sencond_end_time := dataBody["sencond_end_time"].(string)
4529
 
4529
 
4531
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4531
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4532
 		return
4532
 		return
4533
 	}
4533
 	}
4534
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
4534
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
4535
 
4535
 
4536
 	sencond_total_time := dataBody["sencond_total_time"].(string)
4536
 	sencond_total_time := dataBody["sencond_total_time"].(string)
4537
 
4537
 
4551
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4551
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4552
 		return
4552
 		return
4553
 	}
4553
 	}
4554
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
4554
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
4555
 
4555
 
4556
 	third_end_time := dataBody["third_end_time"].(string)
4556
 	third_end_time := dataBody["third_end_time"].(string)
4557
 
4557
 
4559
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4559
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4560
 		return
4560
 		return
4561
 	}
4561
 	}
4562
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
4562
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
4563
 
4563
 
4564
 	third_total_time := dataBody["third_total_time"].(string)
4564
 	third_total_time := dataBody["third_total_time"].(string)
4565
 
4565
 
4575
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4575
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4576
 		return
4576
 		return
4577
 	}
4577
 	}
4578
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
4578
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
4579
 
4579
 
4580
 	last_end_time := dataBody["last_end_time"].(string)
4580
 	last_end_time := dataBody["last_end_time"].(string)
4581
 
4581
 
4583
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4583
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4584
 		return
4584
 		return
4585
 	}
4585
 	}
4586
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
4586
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
4587
 
4587
 
4588
 	last_total_time := dataBody["last_total_time"].(string)
4588
 	last_total_time := dataBody["last_total_time"].(string)
4589
 
4589
 
4723
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4723
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4724
 		return
4724
 		return
4725
 	}
4725
 	}
4726
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
4726
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
4727
 
4727
 
4728
 	first_end_time := dataBody["first_end_time"].(string)
4728
 	first_end_time := dataBody["first_end_time"].(string)
4729
 
4729
 
4731
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4731
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4732
 		return
4732
 		return
4733
 	}
4733
 	}
4734
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
4734
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
4735
 
4735
 
4736
 	first_total_time := dataBody["first_total_time"].(string)
4736
 	first_total_time := dataBody["first_total_time"].(string)
4737
 
4737
 
4751
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4751
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4752
 		return
4752
 		return
4753
 	}
4753
 	}
4754
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
4754
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
4755
 
4755
 
4756
 	sencond_end_time := dataBody["sencond_end_time"].(string)
4756
 	sencond_end_time := dataBody["sencond_end_time"].(string)
4757
 
4757
 
4759
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4759
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4760
 		return
4760
 		return
4761
 	}
4761
 	}
4762
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
4762
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
4763
 
4763
 
4764
 	sencond_total_time := dataBody["sencond_total_time"].(string)
4764
 	sencond_total_time := dataBody["sencond_total_time"].(string)
4765
 
4765
 
4779
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4779
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4780
 		return
4780
 		return
4781
 	}
4781
 	}
4782
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
4782
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
4783
 
4783
 
4784
 	third_end_time := dataBody["third_end_time"].(string)
4784
 	third_end_time := dataBody["third_end_time"].(string)
4785
 
4785
 
4787
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4787
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4788
 		return
4788
 		return
4789
 	}
4789
 	}
4790
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
4790
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
4791
 
4791
 
4792
 	third_total_time := dataBody["third_total_time"].(string)
4792
 	third_total_time := dataBody["third_total_time"].(string)
4793
 
4793
 
4803
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4803
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4804
 		return
4804
 		return
4805
 	}
4805
 	}
4806
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
4806
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
4807
 
4807
 
4808
 	last_end_time := dataBody["last_end_time"].(string)
4808
 	last_end_time := dataBody["last_end_time"].(string)
4809
 
4809
 
4811
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4811
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4812
 		return
4812
 		return
4813
 	}
4813
 	}
4814
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
4814
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
4815
 
4815
 
4816
 	last_total_time := dataBody["last_total_time"].(string)
4816
 	last_total_time := dataBody["last_total_time"].(string)
4817
 
4817
 
4912
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4912
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4913
 		return
4913
 		return
4914
 	}
4914
 	}
4915
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
4915
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
4916
 
4916
 
4917
 	first_end_time := dataBody["first_end_time"].(string)
4917
 	first_end_time := dataBody["first_end_time"].(string)
4918
 
4918
 
4920
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4920
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4921
 		return
4921
 		return
4922
 	}
4922
 	}
4923
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
4923
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
4924
 
4924
 
4925
 	first_total_time := dataBody["first_total_time"].(string)
4925
 	first_total_time := dataBody["first_total_time"].(string)
4926
 
4926
 
4940
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4940
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4941
 		return
4941
 		return
4942
 	}
4942
 	}
4943
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
4943
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
4944
 
4944
 
4945
 	sencond_end_time := dataBody["sencond_end_time"].(string)
4945
 	sencond_end_time := dataBody["sencond_end_time"].(string)
4946
 
4946
 
4948
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4948
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4949
 		return
4949
 		return
4950
 	}
4950
 	}
4951
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
4951
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
4952
 
4952
 
4953
 	sencond_total_time := dataBody["sencond_total_time"].(string)
4953
 	sencond_total_time := dataBody["sencond_total_time"].(string)
4954
 
4954
 
4968
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4968
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4969
 		return
4969
 		return
4970
 	}
4970
 	}
4971
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
4971
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
4972
 
4972
 
4973
 	third_end_time := dataBody["third_end_time"].(string)
4973
 	third_end_time := dataBody["third_end_time"].(string)
4974
 
4974
 
4976
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4976
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4977
 		return
4977
 		return
4978
 	}
4978
 	}
4979
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
4979
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
4980
 
4980
 
4981
 	third_total_time := dataBody["third_total_time"].(string)
4981
 	third_total_time := dataBody["third_total_time"].(string)
4982
 
4982
 
4996
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4996
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
4997
 		return
4997
 		return
4998
 	}
4998
 	}
4999
-	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_start_time)
4999
+	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
5000
 
5000
 
5001
 	fourth_end_time := dataBody["fourth_end_time"].(string)
5001
 	fourth_end_time := dataBody["fourth_end_time"].(string)
5002
 
5002
 
5004
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5004
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5005
 		return
5005
 		return
5006
 	}
5006
 	}
5007
-	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_end_time)
5007
+	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
5008
 
5008
 
5009
 	fourth_total_time := dataBody["fourth_total_time"].(string)
5009
 	fourth_total_time := dataBody["fourth_total_time"].(string)
5010
 
5010
 
5023
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5023
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5024
 		return
5024
 		return
5025
 	}
5025
 	}
5026
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
5026
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
5027
 
5027
 
5028
 	last_end_time := dataBody["last_end_time"].(string)
5028
 	last_end_time := dataBody["last_end_time"].(string)
5029
 
5029
 
5031
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5031
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5032
 		return
5032
 		return
5033
 	}
5033
 	}
5034
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
5034
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
5035
 
5035
 
5036
 	last_total_time := dataBody["last_total_time"].(string)
5036
 	last_total_time := dataBody["last_total_time"].(string)
5037
 
5037
 
5182
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5182
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5183
 		return
5183
 		return
5184
 	}
5184
 	}
5185
-	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_start_time)
5185
+	firstStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_start_time)
5186
 
5186
 
5187
 	first_end_time := dataBody["first_end_time"].(string)
5187
 	first_end_time := dataBody["first_end_time"].(string)
5188
 
5188
 
5190
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5190
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5191
 		return
5191
 		return
5192
 	}
5192
 	}
5193
-	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", first_end_time)
5193
+	firstEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", first_end_time)
5194
 
5194
 
5195
 	first_total_time := dataBody["first_total_time"].(string)
5195
 	first_total_time := dataBody["first_total_time"].(string)
5196
 
5196
 
5210
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5210
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5211
 		return
5211
 		return
5212
 	}
5212
 	}
5213
-	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_start_time)
5213
+	sencondStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_start_time)
5214
 
5214
 
5215
 	sencond_end_time := dataBody["sencond_end_time"].(string)
5215
 	sencond_end_time := dataBody["sencond_end_time"].(string)
5216
 
5216
 
5218
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5218
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5219
 		return
5219
 		return
5220
 	}
5220
 	}
5221
-	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sencond_end_time)
5221
+	sencondEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", sencond_end_time)
5222
 
5222
 
5223
 	sencond_total_time := dataBody["sencond_total_time"].(string)
5223
 	sencond_total_time := dataBody["sencond_total_time"].(string)
5224
 
5224
 
5238
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5238
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5239
 		return
5239
 		return
5240
 	}
5240
 	}
5241
-	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_start_time)
5241
+	thirdStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_start_time)
5242
 
5242
 
5243
 	third_end_time := dataBody["third_end_time"].(string)
5243
 	third_end_time := dataBody["third_end_time"].(string)
5244
 
5244
 
5246
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5246
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5247
 		return
5247
 		return
5248
 	}
5248
 	}
5249
-	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", third_end_time)
5249
+	thirdEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", third_end_time)
5250
 
5250
 
5251
 	third_total_time := dataBody["third_total_time"].(string)
5251
 	third_total_time := dataBody["third_total_time"].(string)
5252
 
5252
 
5266
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5266
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5267
 		return
5267
 		return
5268
 	}
5268
 	}
5269
-	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_start_time)
5269
+	fourthStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_start_time)
5270
 
5270
 
5271
 	fourth_end_time := dataBody["fourth_end_time"].(string)
5271
 	fourth_end_time := dataBody["fourth_end_time"].(string)
5272
 
5272
 
5274
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5274
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5275
 		return
5275
 		return
5276
 	}
5276
 	}
5277
-	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourth_end_time)
5277
+	fourthEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", fourth_end_time)
5278
 
5278
 
5279
 	fourth_total_time := dataBody["fourth_total_time"].(string)
5279
 	fourth_total_time := dataBody["fourth_total_time"].(string)
5280
 
5280
 
5293
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5293
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5294
 		return
5294
 		return
5295
 	}
5295
 	}
5296
-	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_start_time)
5296
+	lastStartTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_start_time)
5297
 
5297
 
5298
 	last_end_time := dataBody["last_end_time"].(string)
5298
 	last_end_time := dataBody["last_end_time"].(string)
5299
 
5299
 
5301
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5301
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
5302
 		return
5302
 		return
5303
 	}
5303
 	}
5304
-	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", last_end_time)
5304
+	lastEndTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", last_end_time)
5305
 
5305
 
5306
 	last_total_time := dataBody["last_total_time"].(string)
5306
 	last_total_time := dataBody["last_total_time"].(string)
5307
 
5307
 

+ 17 - 0
controllers/mobile_api_controllers/patient_api_controller.go Просмотреть файл

1077
 			item.ExecutionTime = theTime.Unix()
1077
 			item.ExecutionTime = theTime.Unix()
1078
 			item.IsMobile = 1
1078
 			item.IsMobile = 1
1079
 			err = service.SaveHisDoctorAdvice(item)
1079
 			err = service.SaveHisDoctorAdvice(item)
1080
+			if err == nil {
1081
+				drugError := models.XtDrugError{
1082
+					UserOrgId:             adminInfo.Org.Id,
1083
+					DrugId:                item.DrugId,
1084
+					RecordDate:            item.AdviceDate,
1085
+					PatientId:             item.PatientId,
1086
+					Remark:                "执行成功",
1087
+					Status:                1,
1088
+					Ctime:                 time.Now().Unix(),
1089
+					Mtime:                 0,
1090
+					SumCount:              0,
1091
+					Prescribingnumber:     item.PrescribingNumber,
1092
+					PrescribingNumberUnit: item.PrescribingNumberUnit,
1093
+				}
1094
+				service.CreateDrugError(drugError)
1095
+			}
1096
+
1080
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
1097
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
1081
 			redis := service.RedisClient()
1098
 			redis := service.RedisClient()
1082
 			//清空key 值
1099
 			//清空key 值

+ 1 - 1
service/manage_service.go Просмотреть файл

1046
 	//db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
1046
 	//db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
1047
 	//err = db.Raw("select id,date,class,zone,bed_number,patient_id,contagion,dialysis_mode,start_time,end_time,dialysis_hour,hyperfiltratio,weight_loss,warning_value,user_total,move,failure_stage,fault_description,code_information,disinfect_type,disinfectant_type,disinfection,machine_run,fluid_path,disinfectant,disinfection_status,disinfection_residue,long_time,disinfec_startime,disinfec_endtime,dialysis_checked,dialysis_name,norms,dialysis_concentration,germ_checked,germ_name,germ_number,clean,sign_name,status,ctime,mtime,user_org_id,equiment_id,bed,stime from xt_device_information where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= ? and equiment_id = ? and user_org_id = ?",timenow,equitid, orgid).Error
1047
 	//err = db.Raw("select id,date,class,zone,bed_number,patient_id,contagion,dialysis_mode,start_time,end_time,dialysis_hour,hyperfiltratio,weight_loss,warning_value,user_total,move,failure_stage,fault_description,code_information,disinfect_type,disinfectant_type,disinfection,machine_run,fluid_path,disinfectant,disinfection_status,disinfection_residue,long_time,disinfec_startime,disinfec_endtime,dialysis_checked,dialysis_name,norms,dialysis_concentration,germ_checked,germ_name,germ_number,clean,sign_name,status,ctime,mtime,user_org_id,equiment_id,bed,stime from xt_device_information where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= ? and equiment_id = ? and user_org_id = ?",timenow,equitid, orgid).Error
1048
 	day := time.Now().Day()
1048
 	day := time.Now().Day()
1049
-	oldMonth := day - 90
1049
+	oldMonth := day - 30
1050
 	t := time.Date(time.Now().Year(), time.Now().Month(), oldMonth, time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
1050
 	t := time.Date(time.Now().Year(), time.Now().Month(), oldMonth, time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
1051
 
1051
 
1052
 	err = UserReadDB().Model(&information).Where("date>= ? and date <= ? and equiment_id = ? and user_org_id = ? and dialysis_checked = 1 ", t.Unix(), timenow, equitid, orgid).Find(&information).Error
1052
 	err = UserReadDB().Model(&information).Where("date>= ? and date <= ? and equiment_id = ? and user_org_id = ? and dialysis_checked = 1 ", t.Unix(), timenow, equitid, orgid).Find(&information).Error

+ 1 - 1
service/mobile_dialysis_service.go Просмотреть файл

7239
 
7239
 
7240
 func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPatientDryweight, err error) {
7240
 func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.SgjPatientDryweight, err error) {
7241
 
7241
 
7242
-	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Order("id asc").Limit(6).Find(&weight).Error
7242
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Order("id desc").Limit(6).Find(&weight).Error
7243
 
7243
 
7244
 	return weight, err
7244
 	return weight, err
7245
 }
7245
 }