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

controllers/dialysis_record_api_controller.go

@@ -493,6 +493,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			CreatedTime:           time.Now().Unix(),
 			UpdatedTime:           time.Now().Unix(),
 			BloodOxygenSaturation: monitorParam.BloodOxygenSaturation,
+			Creator:               adminUserInfo.AdminUser.Id,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {
@@ -550,6 +551,7 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 		monitor.Result = monitorParam.Result
 		monitor.MonitoringNurse = adminUserInfo.AdminUser.Id
 		monitor.UpdatedTime = time.Now().Unix()
+		monitor.Modify = adminUserInfo.AdminUser.Id
 		monitor.BloodOxygenSaturation = monitorParam.BloodOxygenSaturation
 		updateErr := service.UpdateMonitor(monitor)
 		if updateErr != nil {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -288,7 +288,6 @@ func (c *PatientApiController) EditDoctorAdvice() {
 	advice.Status = 1
 	advice.UpdatedTime = time.Now().Unix()
 	advice.UserOrgId = adminUserInfo.Org.Id
-	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
 	//处理修改医嘱开始时间逻辑(不包括子医嘱)

controllers/patient_api_controller.go

@@ -715,8 +715,6 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 	}
 
 	solution.UpdatedTime = time.Now().Unix()
-	solution.Doctor = adminUserInfo.AdminUser.Id
-	solution.RegistrarsId = adminUserInfo.AdminUser.Id
 
 	err := service.UpdatePatientDialysisSolution(&solution)
 	if err != nil {
@@ -1641,7 +1639,6 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	}
 
 	advice.UpdatedTime = time.Now().Unix()
-	advice.AdviceDoctor = adminUserInfo.AdminUser.Id
 	advice.Modifier = adminUserInfo.AdminUser.Id
 
 	err := service.UpdateDoctorAdvice(&advice)