Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1013,7 +1013,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	safe_package, _ := c.GetInt64("package", 0)
 	a_liquid, _ := c.GetInt64("a_liquid", 0)
 
-	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
+	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	//
 	//if template.TemplateId == 2 || template.TemplateId == 6 {
@@ -1030,11 +1030,11 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	//}
 
 	//TODO 需要根据角色去判断
-	//if appRole.UserType == 2 || appRole.UserType == 1 {
-	//	prescription_doctor = appRole.AdminUserId
-	//} else {
-	//	prescription_doctor = 0
-	//}
+	if appRole.UserType == 2 || appRole.UserType == 1 {
+		prescription_doctor = appRole.AdminUserId
+	} else {
+		prescription_doctor = 0
+	}
 
 	prescription := models.DialysisPrescription{
 
@@ -2248,9 +2248,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 
 		prescription.CreatedTime = dialysisPrescription.CreatedTime
 		prescription.Modifier = adminUserInfo.AdminUser.Id
-		prescription.Creater = adminUserInfo.AdminUser.Id
 		prescription.PrescriptionDoctor = adminUserInfo.AdminUser.Id
-
 		prescription.ID = dialysisPrescription.ID
 		err := service.UpDateDialysisPrescription(&prescription)
 		if err == nil {