Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/dialysis_api_controller.go

@@ -2668,6 +2668,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 				newprescribe.Status = 1
 
+				if adminUserInfo.CurrentOrgId == 10579 {
+					newprescribe.Modifier = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 
 				//记录日志
@@ -2743,7 +2746,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.Creater = adminUserInfo.AdminUser.Id
 					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
 					newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
-
+					if adminUserInfo.CurrentOrgId == 10579 {
+						newprescribe.Modifier = 0
+					}
 					err := service.AddSigleRecord(&newprescribe)
 					//记录日志
 					byterequest, _ := json.Marshal(newprescribe)
@@ -2786,7 +2791,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 					newprescribe.Creater = adminUserInfo.AdminUser.Id
 					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
 					newprescribe.Modifier = adminUserInfo.AdminUser.Id
-
+					if adminUserInfo.CurrentOrgId == 10579 {
+						newprescribe.Modifier = 0
+					}
 					err := service.AddSigleRecord(&newprescribe)
 					//记录日志
 					byterequest, _ := json.Marshal(newprescribe)
@@ -2975,7 +2982,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			newprescribe.TargetUltrafiltration = dewater_amount
 			newprescribe.Chaptalization = lastDialysisPrescribe.Chaptalization
 			newprescribe.Status = 1
-
+			if adminUserInfo.CurrentOrgId == 10579 {
+				newprescribe.Modifier = 0
+			}
 			err := service.AddSigleRecord(&newprescribe)
 			//记录日志
 			byterequest, _ := json.Marshal(newprescribe)
@@ -3048,7 +3057,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.DialysisIrrigation = lastDialysisPrescribe.DialysisIrrigation
 				newprescribe.DialysisDialyszers = lastDialysisPrescribe.DialysisDialyszers
 				newprescribe.Status = 1
-
+				if adminUserInfo.CurrentOrgId == 10579 {
+					newprescribe.Modifier = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)

controllers/his_api_controller.go

@@ -213,13 +213,13 @@ func (c *HisApiController) GetFaPiaoNumber() {
 	number := count + 1
 
 	//if number >= 1000 {
-	//	zero = "0000" + strconv.FormatInt(number, 10)
+	//        zero = "0000" + strconv.FormatInt(number, 10)
 	//} else if number >= 10000 {
-	//	zero = "000" + strconv.FormatInt(number, 10)
+	//        zero = "000" + strconv.FormatInt(number, 10)
 	//} else if number >= 100000 {
-	//	zero = "00" + strconv.FormatInt(number, 10)
+	//        zero = "00" + strconv.FormatInt(number, 10)
 	//} else if number >= 1000000 {
-	//	zero = "0" + strconv.FormatInt(number, 10)
+	//        zero = "0" + strconv.FormatInt(number, 10)
 	//} else {
 	zero = "0" + strconv.FormatInt(number, 10)
 	//}
@@ -229,6 +229,7 @@ func (c *HisApiController) GetFaPiaoNumber() {
 	})
 	return
 }
+
 func (c *HisApiController) ChangeOrderDesc() {
 	id, _ := c.GetInt64("id")
 	desc := c.GetString("desc")
@@ -3174,7 +3175,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 == 9504 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10598 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -7401,7 +7402,6 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 							//advice.UpdatedTime = time.Now().Unix()
 							advice.CreatedTime = hisAdvice.CreatedTime
 							advice.UpdatedTime = time.Now().Unix()
-
 						} else {
 							advice.CreatedTime = hisAdvice.CreatedTime
 							advice.UpdatedTime = hisAdvice.UpdatedTime

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3404,7 +3404,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
-			if adminUserInfo.Org.Id == 10597 { //adminUserInfo.Org.Id == 9538
+			if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 10679 { //adminUserInfo.Org.Id == 9538
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
 			}
 
@@ -4443,7 +4443,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			}
 
-			if adminInfo.Org.Id == 10597 {
+			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10679 {
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -4519,7 +4519,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 
-			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 {
+			if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10599 || adminInfo.Org.Id == 10679 {
 				record.UltrafiltrationRate = 0
 			}
 			//if template.TemplateId == 47 {
@@ -4547,7 +4547,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if adminInfo.Org.Id == 10597 {
+	if adminInfo.Org.Id == 10597 || adminInfo.Org.Id == 10679 {
 		ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 		record.UltrafiltrationVolume = ultrafiltration_volume
 	}
@@ -5602,7 +5602,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 9671 {
+		if adminUserInfo.Org.Id == 10597 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10164 {
 			list, err := service.CreateMGroupAdviceOne(adminUserInfo.Org.Id, advices, groupNo)
 			for _, item := range advices {
 				byterequest, _ := json.Marshal(item)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2722,13 +2722,16 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		newprescribe.ID = dialysisPrescription.ID
 
 		if dialysisPrescription.ID == 0 {
-			if adminUserInfo.Org.Id == 10340 {
+			if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10679 {
 				newprescribe.Sodium = 138
 				newprescribe.Bicarbonate = 31.1
 				newprescribe.DialysateFlow = 500
 				newprescribe.PrescribingNumber = 1
 
 			}
+			if adminUserInfo.Org.Id == 10579 {
+				newprescribe.Modifier = 0
+			}
 			err := service.AddSigleRecord(&newprescribe)
 			//记录日志
 			byterequest, _ := json.Marshal(newprescribe)
@@ -2887,11 +2890,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 			newprescribe.ID = dialysisPrescription.ID
 			if dialysisPrescription.ID == 0 {
-				if adminUserInfo.Org.Id == 10340 {
+				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10679 {
 					newprescribe.Sodium = 138
 					newprescribe.Bicarbonate = 31.1
 					newprescribe.DialysateFlow = 500
 				}
+				if adminUserInfo.Org.Id == 10579 {
+					newprescribe.Modifier = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 
 				//记录日志
@@ -2937,7 +2943,12 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 				//
 				if appRole.UserType == 2 || appRole.UserType == 1 {
-					newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+					if adminUserInfo.Org.Id == 10579 {
+						newprescribe.Modifier = 0
+					} else {
+						newprescribe.PrescriptionDoctor = adminUserInfo.AdminUser.Id
+					}
+
 					if adminUserInfo.Org.Id == 9882 {
 						newprescribe.Creater = adminUserInfo.AdminUser.Id
 					}
@@ -3042,11 +3053,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, theAssessmentDateTime, adminUserInfo.Org.Id)
 			newprescribe.ID = dialysisPrescription.ID
 			if dialysisPrescription.ID == 0 {
-				if adminUserInfo.Org.Id == 10340 {
+				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10679 {
 					newprescribe.Sodium = 138
 					newprescribe.Bicarbonate = 31.1
 					newprescribe.DialysateFlow = 500
 				}
+				if adminUserInfo.Org.Id == 10579 {
+					newprescribe.Modifier = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)
@@ -3162,11 +3176,14 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			}
 
 			if dialysisPrescription.ID == 0 {
-				if adminUserInfo.Org.Id == 10340 {
+				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10679 {
 					newprescribe.Sodium = 138
 					newprescribe.Bicarbonate = 31.1
 					newprescribe.DialysateFlow = 500
 				}
+				if adminUserInfo.Org.Id == 10579 {
+					newprescribe.Modifier = 0
+				}
 				err := service.AddSigleRecord(&newprescribe)
 
 				//获取key,清空redis
@@ -3206,6 +3223,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 						newprescribe.Creater = adminUserInfo.AdminUser.Id
 					}
 				}
+				if adminUserInfo.Org.Id == 10579 {
+					newprescribe.Modifier = 0
+				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 
 				//记录日志