his

controllers/his_api_controller.go

@@ -64,9 +64,9 @@ func HisManagerApiRegistRouters() {
 
 	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
 
-	beego.Router("/api/hisprescription/get", &DialysisApiController{}, "Get:GetLastOrNextHisPrescription")
+	beego.Router("/api/hisprescription/get", &HisApiController{}, "Get:GetLastOrNextHisPrescription")
 
-	beego.Router("/api/callhisprescription/get", &DialysisApiController{}, "Get:GetCallHisPrescription")
+	beego.Router("/api/callhisprescription/get", &HisApiController{}, "Get:GetCallHisPrescription")
 
 	beego.Router("/api/dayprescription/get", &HisApiController{}, "get:GetHisDayPrescription")
 

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -76,6 +76,9 @@ func (c *MobileHisApiController) GetHisPatientInfo() {
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.Org.Id, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.Org.Id, patient_id, recordDateTime)
 	order, _ := service.GetHisOrder(admin.Org.Id, number, patient_id)
+	all_prescriptions, _ := service.GetCallHisPrescriptions(startRecordDateTime, endRecordDateTime, admin.Org.Id, patient_id)
+
+	adminUserInfo, _ := service.GetAdminUserInfoByID(admin.Org.Id, admin.AdminUser.Id)
 
 	doctors, _ := service.GetHisAdminUserDoctors(admin.Org.Id)
 	//获取所有科室信息
@@ -91,6 +94,8 @@ func (c *MobileHisApiController) GetHisPatientInfo() {
 		"order":               order,
 		"doctors":             doctors,
 		"department":          department,
+		"admin_user_info":     adminUserInfo,
+		"all_prescriptions":   all_prescriptions,
 	})
 	return
 

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -167,11 +167,11 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/hispatientlist/get", &MobileHisApiController{}, "Get:GetHisPatientList")
 	beego.Router("/m/api/prescriptionconfig/get", &MobileHisApiController{}, "Get:GetHisPrescriptionConfig")
 	beego.Router("/m/api/prescriptioninfo/get", &MobileHisApiController{}, "Get:GetHisPatientInfo")
-	beego.Router("/m/api/prescription/cell", &MobileHisApiController{}, "Get:GetCallHisPrescription")
+	beego.Router("/m/api/prescription/call", &MobileHisApiController{}, "Get:GetCallHisPrescription")
 	beego.Router("/m/api/lastornextprescription/get", &MobileHisApiController{}, "Get:GetLastOrNextHisPrescription")
 	beego.Router("/m/api/prescription/delete", &MobileHisApiController{}, "Post:DeletePrescription")
-	beego.Router("/m/api/hisdoctoradvice/delete", &MobileHisApiController{}, "Post:DeletePrescription")
-	beego.Router("/m/api/hisproject/delete", &MobileHisApiController{}, "Post:DeleteDoctorAdvice")
+	beego.Router("/m/api/hisdoctoradvice/delete", &MobileHisApiController{}, "Post:DeleteDoctorAdvice")
+	beego.Router("/m/api/hisproject/delete", &MobileHisApiController{}, "Post:DeleteProject")
 	beego.Router("/m/api/prescription/create", &MobileHisApiController{}, "Post:CreateHisPrescription")
 
 }

service/his_service.go

@@ -1145,11 +1145,11 @@ func (VMHisPrescriptionTwo) TableName() string {
 func GetAllProjectTeamList(orgid int64) (project []*VMHisProjectTeam, err error) {
 	err = XTReadDB().Model(&VMHisProjectTeam{}).Where("user_org_id = ? and status = 1", orgid).Find(&project).Error
 	for _, item := range project {
-		var project_item *VMHisProject
+		var project_item VMHisProject
 		ids := strings.Split(item.ProjectId, ",")
 		for _, id := range ids {
-			XTReadDB().Model(&VMSchedule{}).Where("user_org_id = ? and status = 1 AND id = ?", id).First(&project_item)
-			item.VMHisProject = append(item.VMHisProject, project_item)
+			XTReadDB().Model(&VMSchedule{}).Where("user_org_id = ? and status = 1 AND id = ?", orgid, id).First(&project_item)
+			item.VMHisProject = append(item.VMHisProject, &project_item)
 		}
 	}
 	return