库存调拨修改

controllers/dialysis_api_controller.go

@@ -445,7 +445,7 @@ func (c *DialysisApiController) PostPrescription() {
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
-	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 {
+	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
 		advice := models.DoctorAdvice{
 			UserOrgId:             adminUserInfo.CurrentOrgId,
 			PatientId:             patient,
@@ -521,7 +521,8 @@ func (c *DialysisApiController) PostPrescription() {
 			advice.AdviceName = "无抗凝剂"
 			break
 		}
-		advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			advice.AdviceDoctor = appRole.AdminUserId
 		}
@@ -1141,7 +1142,7 @@ func (c *DialysisApiController) PostSoulution() {
 	service.UpdateDialysisSolutionStatusTwo(dialysisSolution.ID, dialysisSolution.ModeId, dialysisSolution.UserOrgId, dialysisSolution.PatientId)
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
-	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 {
+	if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 10340 {
 		advice := models.DoctorAdvice{
 			UserOrgId:             adminUserInfo.CurrentOrgId,
 			PatientId:             patient,
@@ -1217,7 +1218,7 @@ func (c *DialysisApiController) PostSoulution() {
 			advice.AdviceName = "无抗凝剂"
 			break
 		}
-		advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			advice.AdviceDoctor = appRole.AdminUserId
 		}
@@ -1225,17 +1226,18 @@ func (c *DialysisApiController) PostSoulution() {
 		// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
 		advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 
-		if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 5 || anticoagulant == 7) {
-			advice.AdviceName = "低分子肝素钙注射液"
+		if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7) {
+			advice.AdviceName = "低分子肝素钠注射液"
 			// 修改患者临时医嘱里的抗凝剂医嘱
 			advice.ID = advicePrescription.ID
 			service.UpdateDoctorAdvice(&advice)
 		} else {
 			// 新增患者临时医嘱里的抗凝剂医嘱
-			if anticoagulant == 3 || anticoagulant == 5 || anticoagulant == 7 {
-				advice.AdviceName = "低分子肝素钙注射液"
+			if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
+				advice.AdviceName = "低分子肝素钠注射液"
+				service.CreateDoctorAdvice(&advice)
 			}
-			service.CreateDoctorAdvice(&advice)
+
 		}
 
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1657,7 +1657,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		err := service.AddSigleRecord(&prescription)
 
 		//长沙南雅医院，自动生成抗凝剂的临时处方
-		if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 {
+		if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
 			advice := models.DoctorAdvice{
 				UserOrgId:             adminUserInfo.Org.Id,
 				PatientId:             id,
@@ -1733,7 +1733,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 				advice.AdviceName = "无抗凝剂"
 				break
 			}
-			advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+			//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
 			if appRole.UserType == 2 || appRole.UserType == 1 {
 				advice.AdviceDoctor = appRole.AdminUserId
 			}
@@ -1748,9 +1748,10 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 			} else {
 				if anticoagulant == 3 || anticoagulant == 5 || anticoagulant == 7 {
 					advice.AdviceName = "低分子肝素钠注射液"
+					// 新增患者临时医嘱里的抗凝剂医嘱
+					service.CreateDoctorAdvice(&advice)
 				}
-				// 新增患者临时医嘱里的抗凝剂医嘱
-				service.CreateDoctorAdvice(&advice)
+
 			}
 
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
@@ -2747,7 +2748,7 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	// 如果当天有插入数据，则不再往透析纪录里插入数据
 	if newdialysisRecord.ID > 0 {
-		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9675 {
+		if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 {
 			record.Temperature = 36.5
 			record.ArterialPressure = -100
 			record.DialysateTemperature = 36.5
@@ -2755,6 +2756,7 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.BreathingRate = "20"
 			record.VenousPressure = 80
 			record.TransmembranePressure = 60
+			record.Dispose = catheter_operation
 		}
 		//针对新化博翔
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10447 {
@@ -3210,7 +3212,7 @@ func (c *DialysisAPIController) PostSolution() {
 	service.UpdateDialysisSolutionStatusTwo(dialysisSolution.ID, dialysisSolution.ModeId, dialysisSolution.UserOrgId, dialysisSolution.PatientId)
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
-	if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 {
+	if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 {
 		advice := models.DoctorAdvice{
 			UserOrgId:             adminUserInfo.Org.Id,
 			PatientId:             id,
@@ -3286,7 +3288,7 @@ func (c *DialysisAPIController) PostSolution() {
 			advice.AdviceName = "无抗凝剂"
 			break
 		}
-		advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
+		//advice.AdviceDesc = "首剂" + strconv.FormatFloat(anticoagulant_shouji, 'f', -1, 64) + "维持" + strconv.FormatFloat(anticoagulant_weichi, 'f', -1, 64) + "总量" + strconv.FormatFloat(anticoagulant_zongliang, 'f', -1, 64)
 		if appRole.UserType == 2 || appRole.UserType == 1 {
 			advice.AdviceDoctor = appRole.AdminUserId
 		}
@@ -3294,13 +3296,18 @@ func (c *DialysisAPIController) PostSolution() {
 		// 患者的临时医嘱里查找是否有抗凝剂临时医嘱
 		advicePrescription, _ := service.GetAdvicesByPrescription(adminUserInfo.Org.Id, id, recordDate.Unix())
 
-		if advicePrescription.ID > 0 {
+		if advicePrescription.ID > 0 && (anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7) {
+
+			advice.AdviceName = "低分子肝素钠注射液"
 			// 修改患者临时医嘱里的抗凝剂医嘱
 			advice.ID = advicePrescription.ID
 			service.UpdateDoctorAdvice(&advice)
 		} else {
-			// 新增患者临时医嘱里的抗凝剂医嘱
-			service.CreateDoctorAdvice(&advice)
+			if anticoagulant == 3 || anticoagulant == 6 || anticoagulant == 7 {
+				advice.AdviceName = "低分子肝素钠注射液"
+				service.CreateDoctorAdvice(&advice)
+			}
+
 		}
 
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":doctor_advices"
@@ -3561,7 +3568,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 	//长沙南雅累计血容量自动计算
 	if adminInfo.Org.Id == 10340 || adminInfo.Org.Id == 9671 {
-		record.AccumulatedBloodVolume = record.BloodFlowVolume * (math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * 60) / 1000
+		record.AccumulatedBloodVolume = (record.BloodFlowVolume - 25) * (math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime)/3600) * 60) / 1000
 	}
 
 	if template.TemplateId == 47 || template.TemplateId == 54 {
@@ -8139,3 +8146,33 @@ func (this *DialysisAPIController) CheckSchedule() {
 	}
 
 }
+
+func (this *DialysisAPIController) GetNewDoctorListToday() {
+
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type, _ := this.GetInt64("partion_type")
+
+	start_time := this.GetString("start_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	list, err := service.GetDialysisAdviceSchedulist(orgId, schedule_type, partion_type, startTime.Unix())
+	_, config := service.FindXTHisRecordByOrgId(orgId)
+	appId := this.GetMobileAdminUserInfo().App.Id
+	doctorList, _ := service.GetAllAdminUsers(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":       list,
+			"config":     config,
+			"doctorList": doctorList,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -188,4 +188,6 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/settlemobileadvice", &DialysisAPIController{}, "Get:GetSettleMobileAdvice")
 
 	beego.Router("/m/api/checkmobileadvice", &DialysisAPIController{}, "Get:GetCheckMobileAdvice")
+
+	beego.Router("/m/api/getnewdoctorlisttoday", &DialysisAPIController{}, "Get:GetNewDoctorListToday")
 }

models/device_models.go

@@ -110,6 +110,7 @@ type DeviceZone struct {
 	CreateTime int64  `gorm:"column:ctime" json:"-"`
 	ModifyTime int64  `gorm:"column:mtime" json:"-"`
 	Status     int64  `gorm:"column:status" json:"status" form:"status"`
+	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
 }
 
 func (DeviceZone) TableName() string {
@@ -696,7 +697,7 @@ type DeviceCultures struct {
 	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
-//细菌培养检测
+// 细菌培养检测
 type DeviceCulture struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	SpelingDate       int64  `gorm:"column:speling_date" json:"speling_date" form:"speling_date"`
@@ -749,7 +750,7 @@ type DeviceDialysates struct {
 	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
-//内霉素检测
+// 内霉素检测
 type DeviceDialysate struct {
 	ID                int64  `gorm:"column:id" json:"id" form:"id"`
 	SamplingDate      int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
@@ -808,7 +809,7 @@ type DeviceIons struct {
 	Modifications   int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
-//透析液离子浓度检测
+// 透析液离子浓度检测
 type DeviceIon struct {
 	ID              int64  `gorm:"column:id" json:"id" form:"id"`
 	SamplingDate    int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`