Преглед на файлове

Merge branch '20200710_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20200710_xt_api_new_branch

XMLWAN преди 4 години
родител
ревизия
5ca12268c0

+ 28 - 24
controllers/dialysis_api_controller.go Целия файл

2780
 	id, _ := c.GetInt64("patient", 0)
2780
 	id, _ := c.GetInt64("patient", 0)
2781
 	recordDateStr := c.GetString("record_date")
2781
 	recordDateStr := c.GetString("record_date")
2782
 	checkTimeStr := c.GetString("check_time")
2782
 	checkTimeStr := c.GetString("check_time")
2783
+	firstCheckTimeStr := c.GetString("first_check_time")
2784
+	creater, _ := c.GetInt64("creater", 0)
2785
+	modifier, _ := c.GetInt64("modifier", 0)
2783
 
2786
 
2784
 	dialysis_item_check, _ := c.GetInt64("dialysis_item_check", 0)
2787
 	dialysis_item_check, _ := c.GetInt64("dialysis_item_check", 0)
2785
 	dialysis_parameter_check, _ := c.GetInt64("dialysis_parameter_check", 0)
2788
 	dialysis_parameter_check, _ := c.GetInt64("dialysis_parameter_check", 0)
2818
 	}
2821
 	}
2819
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", checkTimeStr)
2822
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", checkTimeStr)
2820
 
2823
 
2824
+	if len(firstCheckTimeStr) == 0 {
2825
+		firstCheckTimeStr = time.Now().Format("2006-01-02 15:04")
2826
+	}
2827
+	firstCheckTimeDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", firstCheckTimeStr)
2828
+
2821
 	doubleCheck := models.DoubleCheck{
2829
 	doubleCheck := models.DoubleCheck{
2822
 		UserOrgId:                  adminUserInfo.CurrentOrgId,
2830
 		UserOrgId:                  adminUserInfo.CurrentOrgId,
2823
 		PatientId:                  id,
2831
 		PatientId:                  id,
2838
 
2846
 
2839
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
2847
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
2840
 	if check.ID == 0 { //新增
2848
 	if check.ID == 0 { //新增
2841
-		doubleCheck.FirstCheckTime = checkDate.Unix()
2849
+		doubleCheck.FirstCheckTime = firstCheckTimeDate.Unix()
2850
+		doubleCheck.CheckTime = checkDate.Unix()
2851
+
2852
+		doubleCheck.Creater = creater
2853
+		doubleCheck.Modifier = modifier
2842
 
2854
 
2843
-		doubleCheck.Creater = adminUserInfo.AdminUser.Id
2844
 		err := service.AddSigleDoubleCheck(&doubleCheck)
2855
 		err := service.AddSigleDoubleCheck(&doubleCheck)
2845
 		if err == nil {
2856
 		if err == nil {
2846
 			c.ServeSuccessJSON(map[string]interface{}{
2857
 			c.ServeSuccessJSON(map[string]interface{}{
2851
 
2862
 
2852
 		}
2863
 		}
2853
 	} else { //修改
2864
 	} else { //修改
2854
-		if check.Modifier != 0 {
2855
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoubleCheckWrong)
2856
 
2865
 
2857
-		} else {
2858
-			if adminUserInfo.AdminUser.Id == check.Creater {
2859
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoubleCheckUserWrong)
2860
-				return
2861
-			}
2862
-			doubleCheck.FirstCheckTime = check.FirstCheckTime
2863
-			doubleCheck.CheckTime = checkDate.Unix()
2864
-			doubleCheck.Creater = check.Creater
2865
-			doubleCheck.CreatedTime = check.CreatedTime
2866
-			doubleCheck.UpdatedTime = time.Now().Unix()
2867
-			doubleCheck.Modifier = adminUserInfo.AdminUser.Id
2868
-			doubleCheck.ID = check.ID
2869
-			err := service.UpdateDoubleCheck(&doubleCheck)
2870
-			if err == nil {
2871
-				c.ServeSuccessJSON(map[string]interface{}{
2872
-					"doubleCheck": doubleCheck,
2873
-				})
2874
-			} else {
2875
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
2876
-			}
2866
+		doubleCheck.FirstCheckTime = firstCheckTimeDate.Unix()
2867
+		doubleCheck.CheckTime = checkDate.Unix()
2868
+
2869
+		doubleCheck.Creater = creater
2870
+		doubleCheck.Modifier = modifier
2877
 
2871
 
2872
+		doubleCheck.CreatedTime = check.CreatedTime
2873
+		doubleCheck.UpdatedTime = time.Now().Unix()
2874
+		doubleCheck.ID = check.ID
2875
+		err := service.UpdateDoubleCheck(&doubleCheck)
2876
+		if err == nil {
2877
+			c.ServeSuccessJSON(map[string]interface{}{
2878
+				"doubleCheck": doubleCheck,
2879
+			})
2880
+		} else {
2881
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
2878
 		}
2882
 		}
2879
 
2883
 
2880
 	}
2884
 	}

+ 53 - 23
controllers/mobile_api_controllers/dialysis_api_controller.go Целия файл

531
 	id, _ := c.GetInt64("patient", 0)
531
 	id, _ := c.GetInt64("patient", 0)
532
 	recordDateStr := c.GetString("record_date")
532
 	recordDateStr := c.GetString("record_date")
533
 	checkTimeStr := c.GetString("check_time")
533
 	checkTimeStr := c.GetString("check_time")
534
+	firstCheckTimeStr := c.GetString("first_check_time")
535
+
536
+	creater, _ := c.GetInt64("creater", 0)
537
+	modifier, _ := c.GetInt64("modifier", 0)
534
 
538
 
535
 	dialysis_item_check, _ := c.GetInt64("dialysis_item_check", 0)
539
 	dialysis_item_check, _ := c.GetInt64("dialysis_item_check", 0)
536
 	dialysis_parameter_check, _ := c.GetInt64("dialysis_parameter_check", 0)
540
 	dialysis_parameter_check, _ := c.GetInt64("dialysis_parameter_check", 0)
569
 	}
573
 	}
570
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", checkTimeStr)
574
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", checkTimeStr)
571
 
575
 
576
+	if len(firstCheckTimeStr) == 0 {
577
+		firstCheckTimeStr = time.Now().Format("2006-01-02 15:04:05")
578
+	}
579
+	firstCheckDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", firstCheckTimeStr)
580
+
572
 	//now := time.Now()
581
 	//now := time.Now()
573
 	//year, month, day := now.Date()
582
 	//year, month, day := now.Date()
574
 	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
583
 	//today_time := time.Date(year, month, day, 0, 0, 0, 0, time.Local)
588
 		Collator:                   collator,
597
 		Collator:                   collator,
589
 		Status:                     1,
598
 		Status:                     1,
590
 		CreatedTime:                time.Now().Unix(),
599
 		CreatedTime:                time.Now().Unix(),
591
-		UpdatedTime:                time.Now().Unix(),
592
 		CheckDate:                  recordDate.Unix(),
600
 		CheckDate:                  recordDate.Unix(),
601
+		UpdatedTime:                time.Now().Unix(),
593
 	}
602
 	}
594
 
603
 
595
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
604
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
596
 	if check.ID == 0 { //新增
605
 	if check.ID == 0 { //新增
597
-		doubleCheck.FirstCheckTime = checkDate.Unix()
606
+		doubleCheck.FirstCheckTime = firstCheckDate.Unix()
607
+		doubleCheck.CheckTime = checkDate.Unix()
608
+		doubleCheck.Creater = creater
609
+		doubleCheck.Modifier = modifier
598
 
610
 
599
-		doubleCheck.Creater = adminUserInfo.AdminUser.Id
600
 		err := service.AddSigleDoubleCheck(&doubleCheck)
611
 		err := service.AddSigleDoubleCheck(&doubleCheck)
601
 		if err == nil {
612
 		if err == nil {
602
 			c.ServeSuccessJSON(map[string]interface{}{
613
 			c.ServeSuccessJSON(map[string]interface{}{
604
 			})
615
 			})
605
 		}
616
 		}
606
 	} else { //修改
617
 	} else { //修改
607
-		if check.Modifier != 0 {
608
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoubleCheckWrong)
609
-
610
-		} else {
611
-			if adminUserInfo.AdminUser.Id == check.Creater {
612
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoubleCheckUserWrong)
613
-				return
614
-			}
615
-			doubleCheck.FirstCheckTime = check.FirstCheckTime
616
-			doubleCheck.CheckTime = checkDate.Unix()
617
-			doubleCheck.Creater = check.Creater
618
-			doubleCheck.CreatedTime = check.CreatedTime
619
-			doubleCheck.Modifier = adminUserInfo.AdminUser.Id
620
-			doubleCheck.ID = check.ID
621
-			err := service.UpdateDoubleCheck(&doubleCheck)
622
-			if err == nil {
623
-				c.ServeSuccessJSON(map[string]interface{}{
624
-					"doubleCheck": &doubleCheck,
625
-				})
626
-			}
627
 
618
 
619
+		doubleCheck.FirstCheckTime = firstCheckDate.Unix()
620
+		doubleCheck.CheckTime = checkDate.Unix()
621
+		doubleCheck.Creater = creater
622
+		doubleCheck.Modifier = modifier
623
+		doubleCheck.CreatedTime = check.CreatedTime
624
+		doubleCheck.ID = check.ID
625
+		err := service.UpdateDoubleCheck(&doubleCheck)
626
+		if err == nil {
627
+			c.ServeSuccessJSON(map[string]interface{}{
628
+				"doubleCheck": &doubleCheck,
629
+			})
628
 		}
630
 		}
629
 
631
 
630
 	}
632
 	}
6427
 	})
6429
 	})
6428
 
6430
 
6429
 }
6431
 }
6432
+
6433
+func (this *DialysisAPIController) GetLastOrNextDoctorAdvice() {
6434
+	change_type, _ := this.GetInt64("type", 0)
6435
+	record_date := this.GetString("record_time")
6436
+	patient_id, _ := this.GetInt64("patient_id", 0)
6437
+
6438
+	timeLayout := "2006-01-02"
6439
+	loc, _ := time.LoadLocation("Local")
6440
+	theAdviceRecordTime, _ := time.ParseInLocation(timeLayout, record_date, loc)
6441
+	record_time := theAdviceRecordTime.Unix()
6442
+	adminUserInfo := this.GetMobileAdminUserInfo()
6443
+	advices, sch, err := service.GetDoctorAdviceByType(change_type, record_time, adminUserInfo.Org.Id, patient_id)
6444
+	if err == nil {
6445
+		if len(advices) == 0 {
6446
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceEmpty)
6447
+			return
6448
+		} else {
6449
+			this.ServeSuccessJSON(map[string]interface{}{
6450
+				"advices":  advices,
6451
+				"schedule": sch,
6452
+			})
6453
+			return
6454
+		}
6455
+	} else {
6456
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
6457
+		return
6458
+	}
6459
+}

+ 2 - 0
controllers/mobile_api_controllers/mobile_api_router_register.go Целия файл

116
 
116
 
117
 	beego.Router("/m/api/dialysis/schedule", &DialysisAPIController{}, "Get:GetDialysisSchedule")
117
 	beego.Router("/m/api/dialysis/schedule", &DialysisAPIController{}, "Get:GetDialysisSchedule")
118
 
118
 
119
+	beego.Router("/m/api/doctoradvice/get", &DialysisAPIController{}, "Get:GetLastOrNextDoctorAdvice")
120
+
119
 }
121
 }

+ 1 - 0
controllers/mobile_api_controllers/patient_api_controller.go Целия файл

2484
 }
2484
 }
2485
 
2485
 
2486
 func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, json map[string]interface{}) int {
2486
 func (c *PatientApiController) setAdviceWithJSON(advice *models.GroupAdvice, json map[string]interface{}) int {
2487
+
2487
 	if json["advice_name"] == nil || reflect.TypeOf(json["advice_name"]).String() != "string" {
2488
 	if json["advice_name"] == nil || reflect.TypeOf(json["advice_name"]).String() != "string" {
2488
 		utils.ErrorLog("advice_name")
2489
 		utils.ErrorLog("advice_name")
2489
 		return enums.ErrorCodeParamWrong
2490
 		return enums.ErrorCodeParamWrong