hahah

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10721 //机构id
+		subscibe.OrgId = 10217 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10217 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18723 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10721 //机构id小英9675或4
+		subscibe.OrgId = 10217 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10217 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18723 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -722,7 +722,7 @@ func (c *DialysisApiController) PostPrescription() {
 
 		err := service.AddSigleRecord(&prescription)
 
-		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 {
+		if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 9478 {
 
 			monitorList, _ := service.GetMobilePatientMonitor(prescription.PatientId, prescription.RecordDate, prescription.UserOrgId)
 
@@ -733,8 +733,15 @@ func (c *DialysisApiController) PostPrescription() {
 				ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 				var replacement_rate float64
 
-				//乘10 除10是为了保留一位小数
-				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				if adminUserInfo.CurrentOrgId == 10721 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				}
+
+				if adminUserInfo.CurrentOrgId == 9478 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
 
 				var firstOpeateTime = monitorList[0].OperateTime
 				for _, item := range monitorList {
@@ -915,8 +922,15 @@ func (c *DialysisApiController) PostPrescription() {
 				ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 				var replacement_rate float64
 
-				//乘10 除10是为了保留一位小数
-				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				if adminUserInfo.CurrentOrgId == 10721 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				}
+
+				if adminUserInfo.CurrentOrgId == 9478 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
 
 				var firstOpeateTime = monitorList[0].OperateTime
 				for _, item := range monitorList {
@@ -1609,7 +1623,7 @@ func (c *DialysisApiController) PostSoulution() {
 
 	err := service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
-	if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 {
+	if adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 9478 {
 
 		monitorList, _ := service.GetMobilePatientMonitor(prescription.PatientId, prescription.RecordDate, prescription.UserOrgId)
 
@@ -1620,8 +1634,15 @@ func (c *DialysisApiController) PostSoulution() {
 			ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 			var replacement_rate float64
 
-			//乘10 除10是为了保留一位小数
-			replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+			if adminUserInfo.CurrentOrgId == 10721 {
+				//乘10 除10是为了保留一位小数
+				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+			}
+
+			if adminUserInfo.CurrentOrgId == 9478 {
+				//乘10 除10是为了保留一位小数
+				replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+			}
 
 			var firstOpeateTime = monitorList[0].OperateTime
 			for _, item := range monitorList {
@@ -4845,7 +4866,7 @@ func (c *DialysisApiController) GetDialysisOrder() {
 	//获取上次的透后体重
 	//	assessmentAfterDislysis, _ := service.MobileGetLastTimeAssessmentAfterDislysis(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	assessmentAfterDislysis, _ := service.MobileGetLast(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
-
+	fmt.Println("assessmentAfterDislysis--------------------------", assessmentAfterDislysis)
 	//获取透析次数
 	_, total, err := service.GetTotalDialysisCout(adminUserInfo.CurrentOrgId, patientInfo.ID)
 

controllers/his_api_controller.go

@@ -3494,7 +3494,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 || adminInfo.CurrentOrgId == 10567 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -149,6 +149,7 @@ func (this *DialysisAPIController) Scheduals() {
 					// 医嘱信息
 					scheduals[key].Advices = make([]models.VMDoctorAdviceForList, 0)
 					for _, advice := range advices {
+
 						if item.PatientId == advice.PatientId {
 							scheduals[key].Advices = append(scheduals[key].Advices, advice)
 						}
@@ -2401,7 +2402,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		err := service.AddSigleRecord(&prescription)
 
 		//溪康 更改目标超滤量 同步监测里面的超滤量 超滤率 置换量 置换率
-		if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10164 {
+		if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 9478 {
 
 			monitorList, _ := service.GetMobilePatientMonitor(prescription.PatientId, prescription.RecordDate, prescription.UserOrgId)
 
@@ -2412,8 +2413,15 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 				var replacement_rate float64
 
-				//乘10 除10是为了保留一位小数
-				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				if adminUserInfo.Org.Id == 10721 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				}
+
+				if adminUserInfo.Org.Id == 9478 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
 
 				var firstOpeateTime = monitorList[0].OperateTime
 				for _, item := range monitorList {
@@ -2710,8 +2718,15 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 				var replacement_rate float64
 
-				//乘10 除10是为了保留一位小数
-				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				if adminUserInfo.Org.Id == 10721 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+				}
+
+				if adminUserInfo.Org.Id == 9478 {
+					//乘10 除10是为了保留一位小数
+					replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+				}
 
 				var firstOpeateTime = monitorList[0].OperateTime
 				for _, item := range monitorList {
@@ -5096,7 +5111,7 @@ func (c *DialysisAPIController) PostSolution() {
 
 	service.SavePrescriptionAndCreateSolution(&solution, &prescription)
 
-	if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10164 {
+	if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 9478 {
 
 		monitorList, _ := service.GetMobilePatientMonitor(prescription.PatientId, prescription.RecordDate, prescription.UserOrgId)
 
@@ -5107,8 +5122,15 @@ func (c *DialysisAPIController) PostSolution() {
 			ultrafiltration_rate = (math.Floor(prescription.PrescriptionWater * 1000 / float64(totalMin) * 60 * 1000)) / 1000
 			var replacement_rate float64
 
-			//乘10 除10是为了保留一位小数
-			replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+			if adminUserInfo.Org.Id == 10721 {
+				//乘10 除10是为了保留一位小数
+				replacement_rate = math.Floor(prescription.ReplacementTotal*1000/float64(totalMin)*10) / 10
+			}
+
+			if adminUserInfo.Org.Id == 9478 {
+				//乘10 除10是为了保留一位小数
+				replacement_rate = math.Floor(prescription.DisplaceLiquiValue*1000/float64(totalMin)*10) / 10
+			}
 
 			var firstOpeateTime = monitorList[0].OperateTime
 			for _, item := range monitorList {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3186,7 +3186,7 @@ func (c *PatientApiController) ModifyExecDoctorAdvice() {
 		}
 		service.ModifyHisPrescriptionProject(&project, ids)
 
-		if adminUserInfo.Org.Id == 10644 {
+		if adminUserInfo.Org.Id == 10644 || adminUserInfo.Org.Id == 9478 {
 			projectList, _ := service.GetHisPrescriptionProjectByIds(ids)
 			if len(projectList) > 0 {
 				for _, item := range projectList {

controllers/patient_api_controller.go

@@ -4143,8 +4143,10 @@ func (c *PatientApiController) CheckDoctorAdvice() {
 }
 
 func (c *PatientApiController) UpdateDoctorAdvice() {
+
 	patient, _ := c.GetInt64("patient", 0)
 	id, _ := c.GetInt64("id", 0)
+
 	if id <= 0 || patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -4153,6 +4155,7 @@ func (c *PatientApiController) UpdateDoctorAdvice() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	advice, _ := service.FindDoctorAdvice(adminUserInfo.CurrentOrgId, id)
+
 	if advice.ID == 0 || advice.PatientId != patient {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDoctorAdviceNotExist)
 		return
@@ -4882,6 +4885,8 @@ func (c *PatientApiController) ProEducation() {
 }
 
 func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (code int) {
+
+	fmt.Println("actiong===============", action)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(data, &dataBody)
 	if err != nil {
@@ -5006,6 +5011,7 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 		return
 	}
 	adviceName, _ := dataBody["advice_name"].(string)
+
 	if len(adviceName) == 0 {
 		utils.ErrorLog("len(advice_name) == 0")
 		code = enums.ErrorCodeParamWrong
@@ -5093,6 +5099,8 @@ func adviceFormData(advice *models.DoctorAdvice, data []byte, action string) (co
 
 	if dataBody["push_start_time"] != nil && reflect.TypeOf(dataBody["push_start_time"]).String() == "string" {
 		push_start_time, _ := dataBody["push_start_time"].(string)
+
+		fmt.Println("push_start_time===========", push_start_time)
 		var startTime int64
 		if len(push_start_time) > 0 {
 			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", push_start_time+" 00:00:00", loc)

service/warhouse_service.go

@@ -8852,12 +8852,14 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 			sum_count += item.StockCount
 		}
 
+		var now_time = time.Now().Unix() + 1
+
 		OutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   now_time,
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -8907,7 +8909,7 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 			Creator:                 creator,
 			UpdateCreator:           0,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   now_time,
 			Mtime:                   0,
 			Price:                   warehouse.PackingPrice, //零售价
 			WarehousingDetailId:     warehouse.ID,