XMLWAN 3 年 前
コミット
87062e5b53
共有3 個のファイルを変更した9 個の追加4 個の削除を含む
  1. 1 1
      conf/app.conf
  2. 6 2
      controllers/mobile_api_controllers/patient_api_controller.go
  3. 2 1
      controllers/stock_in_api_controller.go

+ 1 - 1
conf/app.conf ファイルの表示

@@ -1,5 +1,5 @@
1 1
 appname = 血透
2
-httpport = 9529
2
+httpport = 9531
3 3
 runmode = dev
4 4
 
5 5
 #

+ 6 - 2
controllers/mobile_api_controllers/patient_api_controller.go ファイルの表示

@@ -2692,7 +2692,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
2692 2692
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
2693 2693
 	if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
2694 2694
 		for _, item := range projects {
2695
-			var advice *models.HisDoctorAdviceInfo
2695
+			var advice models.HisDoctorAdviceInfo
2696 2696
 			advice.ID = item.ID
2697 2697
 			advice.Checker = item.Checker
2698 2698
 			advice.CheckTime = item.CheckTime
@@ -2708,7 +2708,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
2708 2708
 				advice.AdviceName = item.HisProject.ProjectName
2709 2709
 			}
2710 2710
 			advice.StartTime = item.StartTime
2711
-			hisAdvice = append(hisAdvice, advice)
2711
+			hisAdvice = append(hisAdvice, &advice)
2712 2712
 		}
2713 2713
 
2714 2714
 	}
@@ -2762,6 +2762,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
2762 2762
 			"check":                   check,
2763 2763
 			"dialysiscount":           dialysiscount,
2764 2764
 			"last_order":              last_order,
2765
+			"projects":                projects,
2766
+			"project_config":          project_config,
2765 2767
 		})
2766 2768
 	}
2767 2769
 
@@ -2782,6 +2784,8 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
2782 2784
 			"check":                   check,
2783 2785
 			"dialysiscount":           dialysiscount,
2784 2786
 			"last_order":              last_order,
2787
+			"projects":                projects,
2788
+			"project_config":          project_config,
2785 2789
 		})
2786 2790
 	}
2787 2791
 

+ 2 - 1
controllers/stock_in_api_controller.go ファイルの表示

@@ -4973,10 +4973,11 @@ func (this *StockManagerApiController) SaveCheckPrice() {
4973 4973
 	fmt.Println(err)
4974 4974
 
4975 4975
 	list, _ := service.GetAdjustCheckPriceList(ids)
4976
+	fmt.Println("list2333223323232323232323", list)
4976 4977
 	for _, item := range list {
4977 4978
 		info := models.GoodInfo{
4978 4979
 			PackingPrice: item.NewPrice,
4979
-			BuyPrice:     item.BuyPrice,
4980
+			BuyPrice:     item.NewPrice,
4980 4981
 		}
4981 4982
 		err = service.UpdateAdjustCheckPrice(&info, item.GoodId)
4982 4983
 		fmt.Println(err)