Browse Source

医保对接

csx 3 years ago
parent
commit
15a090fc77

+ 11 - 4
controllers/doctors_api_controller.go View File

@@ -68,7 +68,12 @@ func (c *DoctorsApiController) ScheduleAdvices() {
68 68
 
69 69
 	scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type)
70 70
 	hisAdvices, _ := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type)
71
+
72
+	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type)
73
+
71 74
 	config, _ := service.GetHisDoctorConfig(orgID)
75
+	project_config, _ := service.GetHisProjectConfig(orgID)
76
+
72 77
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
73 78
 	if err != nil {
74 79
 		c.ErrorLog("获取排班信息失败:%v", err)
@@ -81,10 +86,12 @@ func (c *DoctorsApiController) ScheduleAdvices() {
81 86
 			}
82 87
 		}
83 88
 		c.ServeSuccessJSON(map[string]interface{}{
84
-			"scheduals":  filtedScheduals,
85
-			"adminUser":  adminUser,
86
-			"hisAdvices": hisAdvices,
87
-			"config":     config,
89
+			"scheduals":      filtedScheduals,
90
+			"adminUser":      adminUser,
91
+			"hisAdvices":     hisAdvices,
92
+			"config":         config,
93
+			"project_config": project_config,
94
+			"project":        project,
88 95
 		})
89 96
 	}
90 97
 }

+ 5 - 0
controllers/manager_center_api_controller.go View File

@@ -295,6 +295,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
295 295
 	drug_day := c.GetString("drug_day")
296 296
 	dose, _ := c.GetFloat("dose")
297 297
 	dose_unit := c.GetString("dose_unit")
298
+	total, _ := c.GetFloat("total")
298 299
 
299 300
 	min_price, _ := c.GetFloat("min_price")
300 301
 	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
@@ -367,6 +368,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
367 368
 		MinPrice:                    min_price,
368 369
 		DoseUnit:                    dose_unit,
369 370
 		PrescribingNumberUnit:       prescribing_number_unit,
371
+		Total:                       total,
370 372
 	}
371 373
 
372 374
 	err := service.UpdateBaseDrugLib(drugLib)
@@ -1594,6 +1596,8 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
1594 1596
 	packing_price, _ := c.GetFloat("packing_price")
1595 1597
 	default_count_unit := c.GetString("default_count_unit")
1596 1598
 	min_unit := c.GetString("min_unit")
1599
+	total, _ := c.GetFloat("total")
1600
+
1597 1601
 	adminUserInfo := c.GetAdminUserInfo()
1598 1602
 
1599 1603
 	goodInfo := models.GoodInfo{
@@ -1643,6 +1647,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
1643 1647
 		PackingPrice:                packing_price,
1644 1648
 		DefaultCountUnit:            default_count_unit,
1645 1649
 		MinUnit:                     min_unit,
1650
+		Total:                       total,
1646 1651
 	}
1647 1652
 
1648 1653
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

+ 10 - 4
controllers/mobile_api_controllers/doctor_advice_api_controller.go View File

@@ -42,7 +42,11 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
42 42
 	//获取his医嘱数据
43 43
 	fmt.Println("date.un222222", date.Unix())
44 44
 	hisAdvices, _ := service.GetHisDoctorAdvices(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
45
+
46
+	project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
45 47
 	config, _ := service.GetHisDoctorConfig(orgID)
48
+	project_config, _ := service.GetHisProjectConfig(orgID)
49
+
46 50
 	adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
47 51
 	if err != nil {
48 52
 		this.ErrorLog("获取排班信息失败:%v", err)
@@ -55,10 +59,12 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
55 59
 			}
56 60
 		}
57 61
 		this.ServeSuccessJSON(map[string]interface{}{
58
-			"scheduals":  filtedScheduals,
59
-			"adminUser":  adminUser,
60
-			"hisAdvices": hisAdvices,
61
-			"config":     config,
62
+			"scheduals":      filtedScheduals,
63
+			"adminUser":      adminUser,
64
+			"hisAdvices":     hisAdvices,
65
+			"config":         config,
66
+			"project":        project,
67
+			"project_config": project_config,
62 68
 		})
63 69
 	}
64 70
 }