11月9日库存管理

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 #dev/prod
 

controllers/doctors_api_controller.go

@@ -93,7 +93,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
 	if config.IsOpen == 0 || config.IsOpen == 2 {
-		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way)
+		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, 0)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		if err != nil {
 			c.ErrorLog("获取排班信息失败:%v", err)
@@ -114,7 +114,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 		}
 	}
 	if config.IsOpen == 1 {
-		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way)
+		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, 0)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
 		for _, item := range project {
@@ -1374,7 +1374,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 	partition_type, _ := c.GetInt64("partition_type")
 	patient_id, _ := c.GetInt64("patient_id")
 	excution_way, _ := c.GetInt64("excution_way")
-	//cost_type, _ := c.GetInt64("cost_type")
+	cost_type, _ := c.GetInt64("cost_type")
 	if adviceType != 1 && adviceType != 3 && adviceType != 2 {
 		adviceType = 0
 	}
@@ -1397,7 +1397,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 	project_config, _ := service.GetHisProjectConfig(orgID)
 
 	if config.IsOpen == 0 || config.IsOpen == 2 {
-		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way)
+		scheduals, err := service.MobileGetScheduleDoctorAdvicesOne(orgID, date.Unix(), adviceType, patientType, adminUserInfo.AdminUser.Id, delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		if err != nil {
 			c.ErrorLog("获取排班信息失败:%v", err)
@@ -1418,7 +1418,7 @@ func (c *DoctorsApiController) GetScheduleAdvicesList() {
 		}
 	}
 	if config.IsOpen == 1 {
-		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way)
+		hisAdvices, err := service.GetHisDoctorAdvicesOne(orgID, date.Unix(), delivery_way, schedule_type, partition_type, patient_id, excution_way, cost_type)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminUserInfo.CurrentAppId)
 		project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type, patient_id, excution_way)
 		for _, item := range project {

controllers/his_api_controller.go

@@ -1930,7 +1930,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							s.PatientId = patient_id
 							s.HisPatientId = his_patient_id
 							s.StartTime = pTime
-
+							s.IsSettle = 2
 							errcode := c.setAdviceWithJSON(&s, advice.(map[string]interface{}))
 							if errcode > 0 {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
@@ -2832,14 +2832,26 @@ func (c *HisApiController) DeletePrescription() {
 
 		}
 	}
-	if drugStockConfig.IsOpen == 1 {
+	if c.GetAdminUserInfo().CurrentOrgId == 10387 {
+
 		if len(advices) > 0 {
 			for _, item := range advices {
 				creater := c.GetAdminUserInfo().AdminUser.Id
 				service.DrugAutoAddCancelInfo(item, creater)
 			}
 		}
+
+	} else {
+		if drugStockConfig.IsOpen == 1 {
+			if len(advices) > 0 {
+				for _, item := range advices {
+					creater := c.GetAdminUserInfo().AdminUser.Id
+					service.DrugAutoAddCancelInfo(item, creater)
+				}
+			}
+		}
 	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg": "删除成功",
 	})
@@ -2914,8 +2926,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 	defer redis.Close()
 
 	if err == nil {
-		if drugStockConfig.IsOpen == 1 {
-
+		if c.GetAdminUserInfo().CurrentOrgId == 10387 {
 			//查询是否在处方中出库
 			openConfig, _ := service.GetDrugOpenConfigOne(c.GetAdminUserInfo().CurrentOrgId)
 
@@ -2925,16 +2936,37 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 				if advice.ExecutionState == 1 {
 					creater := c.GetAdminUserInfo().AdminUser.Id
 					service.DrugAutoAddCancelInfo(&advice, creater)
-
 				}
-
 			}
 
 			//开启保存处方扣减功能
 			if openConfig.IsOpen == 1 {
 				creater := c.GetAdminUserInfo().AdminUser.Id
 				service.DrugAutoAddCancelInfo(&advice, creater)
+			}
+		} else {
+			if drugStockConfig.IsOpen == 1 {
+
+				//查询是否在处方中出库
+				openConfig, _ := service.GetDrugOpenConfigOne(c.GetAdminUserInfo().CurrentOrgId)
+
+				if openConfig.IsOpen != 1 {
+
+					//判断该医嘱是否执行了
+					if advice.ExecutionState == 1 {
+						creater := c.GetAdminUserInfo().AdminUser.Id
+						service.DrugAutoAddCancelInfo(&advice, creater)
+
+					}
+
+				}
 
+				//开启保存处方扣减功能
+				if openConfig.IsOpen == 1 {
+					creater := c.GetAdminUserInfo().AdminUser.Id
+					service.DrugAutoAddCancelInfo(&advice, creater)
+
+				}
 			}
 		}
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -379,6 +379,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.Remark = dialysisSolution.Remark
 			if adminUserInfo.Org.Id == 10340 {
 				newprescribe.TargetUltrafiltration = 0
+				newprescribe.Sodium = 138
+				newprescribe.Bicarbonate = 31.1
+				newprescribe.DialysateFlow = 500
 			}
 			//插入透析处方
 			err := service.AddSigleRecord(&newprescribe)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -201,12 +201,11 @@ func (this *DialysisAPIController) Scheduals() {
 				project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
 			}
 
-			list, _ := service.GetZoneCountList(orgID, date.Unix())
+			//list, _ := service.GetZoneCountList(orgID, date.Unix())
 
 			this.ServeSuccessJSON(map[string]interface{}{
 				"scheduals": scheduals,
 				"project":   project,
-				"list":      list,
 			})
 		}
 
@@ -225,13 +224,12 @@ func (this *DialysisAPIController) Scheduals() {
 		if configs.ID > 0 && configs.IsOpen == 1 {
 			project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
 		}
-		list, _ := service.GetZoneCountList(orgID, date.Unix())
+
 		this.ServeSuccessJSON(map[string]interface{}{
 			"scheduals": dat,
 			"redis":     "true",
 			"date":      schedualDate,
 			"project":   project,
-			"list":      list,
 		})
 
 	}
@@ -565,7 +563,6 @@ func (this *DialysisAPIController) DialysisRecord() {
 	if is_advice_open.IsAdviceOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
-	fmt.Println("doctorAdvices23344334344433434334343434wode", doctorAdvices)
 
 	lastOrder, _ := service.GetLastDilysisOrder(adminInfo.Org.Id, patientID, date.Unix())
 	returnData := map[string]interface{}{

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1772,6 +1772,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 		newprescribe.ID = dialysisPrescription.ID
 
 		if dialysisPrescription.ID == 0 {
+			if adminUserInfo.Org.Id == 10340 {
+				newprescribe.Sodium = 138
+				newprescribe.Bicarbonate = 31.1
+				newprescribe.DialysateFlow = 500
+			}
 			err := service.AddSigleRecord(&newprescribe)
 			//获取key,清空redis
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -1797,6 +1802,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 			}
 		} else {
+			if adminUserInfo.Org.Id == 10340 {
+				newprescribe.Sodium = 138
+				newprescribe.Bicarbonate = 31.1
+				newprescribe.DialysateFlow = 500
+			}
 			err := service.UpDateDialysisPrescription(&newprescribe)
 			//获取key,清空redis
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -1879,6 +1889,11 @@ 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 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -1900,7 +1915,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 				keySeven := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":dialysis_prescribe_by_mode"
 				redis.Set(keySeven, "", time.Second)
-				fmt.Println("处方2222222222")
+
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
@@ -1987,9 +2002,13 @@ 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 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.AddSigleRecord(&newprescribe)
 
-				fmt.Println("处方2222222222")
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2014,6 +2033,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
 			} else {
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
@@ -2058,8 +2082,13 @@ 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 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.AddSigleRecord(&newprescribe)
-				fmt.Println("处方44444444444")
+
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"
 				redis := service.RedisClient()
@@ -2084,6 +2113,11 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCommitFail)
 				}
 			} else {
+				if adminUserInfo.Org.Id == 10340 {
+					newprescribe.Sodium = 138
+					newprescribe.Bicarbonate = 31.1
+					newprescribe.DialysateFlow = 500
+				}
 				err := service.UpDateDialysisPrescription(&newprescribe)
 				//获取key,清空redis
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(theAssessmentDateTime, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_prescribe"

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -249,6 +249,7 @@ func (this *StaffScheduleApiController) GetAllZone() {
 
 	id := this.GetMobileAdminUserInfo().Org.Id
 	zone, err := service.GetAllMobileZone(id)
+
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 		return
@@ -283,18 +284,21 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 		//获取当天排班的病人情况
 		schedule, err := service.GetPatientSchedule(startTime, zoneid, classtype, orgid)
 
+		zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
 		if err != nil {
 			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 			return
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schedule": schedule,
+			"zonelist": zonelist,
 		})
 	}
 	if is_open == 1 {
 		//获取空床位的排班数据
 		list, err := service.GetPatientScheduleByBed(startTime, zoneid, orgid, classtype)
 		stockType, _ := service.GetStockType(orgid)
+		zonelist, _ := service.GetPatientScheduleListByZone(startTime, classtype, orgid)
 		if err != nil {
 			this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
 			return
@@ -302,6 +306,7 @@ func (this *StaffScheduleApiController) GetPatientScheduleList() {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schedule":  list,
 			"stockType": stockType,
+			"zonelist":  zonelist,
 		})
 	}
 }

models/patient_models.go

@@ -472,6 +472,7 @@ type DialysisAssesmentBefor struct {
 	PatientId              int64 `gorm:"column:patient_id" json:"patient_id"`
 	AssessmentDate         int64 `gorm:"column:assessment_date" json:"assessment_date" form:"assessment_date"`
 	BloodAccessPartOperaId int64 `gorm:"column:blood_access_part_opera_id" json:"blood_access_part_opera_id" form:"blood_access_part_opera_id"`
+	CreatedTime            int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
 }
 
 func (DialysisAssesmentBefor) TableName() string {

models/schedule_models.go

@@ -500,5 +500,19 @@ type ScheduleTwenty struct {
 }
 
 func (ScheduleTwenty) TableName() string {
-	return "ScheduleTwenty"
+	return "xt_schedule"
+}
+
+type ScheduleTwentyOne struct {
+	ID           int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Status       int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (ScheduleTwentyOne) TableName() string {
+	return "xt_schedule"
 }

service/doctor_schedule_service.go

@@ -741,3 +741,20 @@ func UpdateDialysisPrescriptionOne(prescription models.DialysisPrescription, pat
 	err := XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and status = 1", patientid, recordate).Updates(map[string]interface{}{"dialysis_dialyszers": prescription.DialysisDialyszers, "mode_id": mode_id, "dialysis_irrigation": prescription.DialysisIrrigation}).Error
 	return err
 }
+
+func GetPatientScheduleListByZone(schedule_date int64, class_tye int64, orgid int64) (schedule []*models.ScheduleTwentyOne, err error) {
+
+	db := XTReadDB().Model(&schedule).Where("status = 1")
+
+	if schedule_date > 0 {
+		db = db.Where("schedule_date = ?", schedule_date)
+	}
+	if class_tye > 0 {
+		db = db.Where("schedule_type = ?", class_tye)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Select("partition_id,Count(id) as id,user_org_id").Group("partition_id").Scan(&schedule).Error
+	return schedule, err
+}

service/patient_service.go

@@ -557,9 +557,8 @@ func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients
 	redis := RedisClient()
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(id, 10) + ":patient_info"
-
 	patient_info_str, _ := redis.Get(key).Result()
-	fmt.Println("patient_info_stre223322323232323323223", patient_info_str)
+
 	if len(patient_info_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.Patients{}).Preload("Contagions", "status = 1").Preload("Diseases", "status = 1").Where("id = ? and user_org_id=? and status=1", id, orgID).First(&patient).Error
 		if err != nil {