2024/6/17

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 = 10206 //机构id
+		subscibe.OrgId = 10164 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 10697 //4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12627 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10206 //机构id小英9675或4
+		subscibe.OrgId = 10164 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10206 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 16787 //4
+		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 12627 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/dialysis_api_controller.go

@@ -2579,7 +2579,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 {
 					dewater_amount = dewater_amount * 1000
 				}
 

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -724,7 +724,7 @@ func (this *StaffScheduleApiController) DeleteSchedule() {
 		service.CreateScheduleLog(xtScheduleLog)
 
 		//针对凤凰医院
-		if org_id == 10579 || org_id == 10344 || org_id == 10206 {
+		if org_id == 10579 || org_id == 10344 || org_id == 10206 || org_id == 10679 {
 			advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, org_id)
 			if len(advice) > 0 {
 				service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, org_id)

controllers/new_stock_api_controller.go

@@ -293,6 +293,9 @@ func (this *NewStockApiController) GetPatientDrugCode() {
 	creater := this.GetAdminUserInfo().AdminUser.Id
 	service.DispensingMedicineTwo(orgId, patient_id, advice_date, drug_id, creater)
 
-	this.ServeDynamicFailJsonSend("发药成功!")
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "发药成功!",
+	})
 	return
+
 }

controllers/pharmacy_controller.go

@@ -139,10 +139,13 @@ func (this *PharmacyController) TodayNumber() {
 	itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
 
 	drug, _ := service.GetAllBaseDrugList(orgid)
+
+	config, _ := service.GetDrugCodeConfig(orgid)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"wtotal": wtotal,
 		"itotal": itotal,
 		"drug":   drug,
+		"config": config,
 	})
 	return
 
@@ -351,6 +354,8 @@ func (this *PharmacyController) GetPharmacyContent() {
 	prescriptionListByToDay, _ := service.GetPrescriptionListByToDay(orgid, patient_id, stime)
 
 	diagnose, _ := service.FindAllDiagnose(orgid)
+
+	config, _ := service.GetDrugCodeConfig(orgid)
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -367,6 +372,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 	return_value["doctors"] = allDoctor
 	return_value["prescription"] = prescriptionListByToDay
 	return_value["diagnose"] = diagnose
+	return_value["config"] = config
 	//if is_medicine == 1{发药时间先不展示
 	//	return_value["time"] = time
 	//}
@@ -402,12 +408,26 @@ func (this *PharmacyController) DispensingMedicine() {
 		etime = stime + 86399
 	}
 	tmp_bool := service.IsPharmacyConfig(orgid)
+	codeConfig, _ := service.GetDrugCodeConfig(orgid)
 	if tmp_bool == true {
 		advicelist, _ := service.FindeHisAdviceDocAdvice(orgid, patient_id, stime, etime)
 		if len(advicelist) > 0 {
+
 			var total int64
 			var prescribing_number_total int64
 			for _, item := range advicelist {
+
+				if codeConfig.IsOpen == 1 {
+					if item.DrugCode == "" || len(item.DrugCode) == 0 {
+						err := fmt.Errorf(service.FindDrugsName(item.DrugId) + "药品追溯码不能为空")
+						if err != nil {
+							utils.ErrorLog(err.Error())
+							this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+							return
+						}
+					}
+				}
+
 				//查询改药品信息
 				medical, _ := service.GetBaseDrugMedical(item.DrugId)
 				//如果是药房发药的方式
@@ -797,6 +817,7 @@ func (this *PharmacyController) MedicineDeparture() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数不足")
 		return
 	}
+
 	err = service.MedicineDeparture(ids, creater, orgid)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())

controllers/schedule_api_controller.go

@@ -558,9 +558,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 				} else { //新的排班信息
 
-					fmt.Println("111111111")
 					if items["schedule_date"] == nil || reflect.TypeOf(items["schedule_date"]).String() != "string" {
-						fmt.Println("33333333")
 
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
@@ -603,8 +601,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 					schedule.ScheduleType = scheduleType
 
 					if items["bed_id"] == nil || reflect.TypeOf(items["bed_id"]).String() != "float64" {
-						fmt.Println("~~~~~~22222")
-						utils.ErrorLog("bed_id")
+
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 						return
 					}
@@ -757,7 +754,7 @@ func (c *ScheduleApiController) BatchPostSmartSch() {
 
 					schedule.Status = 0
 					//针对凤凰医院
-					if adminInfo.CurrentOrgId == 10579 || adminInfo.CurrentOrgId == 10344 || adminInfo.CurrentOrgId == 10206 {
+					if adminInfo.CurrentOrgId == 10579 || adminInfo.CurrentOrgId == 10344 || adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10679 {
 						advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
 						if len(advice) > 0 {
 							service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminInfo.CurrentOrgId)
@@ -2211,7 +2208,7 @@ func (c *ScheduleApiController) DeleteSchedule() {
 	service.CreateScheduleLog(scheduleLog)
 
 	//针对凤凰医院
-	if adminINfo.CurrentOrgId == 10579 || adminINfo.CurrentOrgId == 10344 || adminINfo.CurrentOrgId == 10206 {
+	if adminINfo.CurrentOrgId == 10579 || adminINfo.CurrentOrgId == 10344 || adminINfo.CurrentOrgId == 10206 || adminINfo.CurrentOrgId == 10679 {
 		advice, _ := service.GetDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 		if len(advice) > 0 {
 			service.UpdateAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)

service/pharmacy_service.go

@@ -1273,6 +1273,13 @@ func MedicineDeparture(ids string, creater, orgid int64) (err error) {
 				}
 				tmp_bool := IsPharmacyConfig(orgid)
 				if tmp_bool {
+					codeConfig, _ := GetDrugCodeConfig(orgid)
+					if codeConfig.IsOpen == 1 {
+						if v.DrugCode == "" || len(v.DrugCode) == 0 {
+							err = fmt.Errorf(FindDrugsName(v.DrugId) + "药品追溯码不能为空!")
+							return
+						}
+					}
 					if PettyCash(v.DrugId) {
 						continue
 					}

service/self_drug_service.go

@@ -2859,7 +2859,7 @@ func GetGoodNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 func GetGoodNewPurchaseStockQueryOne(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&goodinfo).Where("status = 1")
-	if orgid == 10697 {
+	if orgid == 10697 || orgid == 10644 {
 		db = db.Where("find_in_set('停用',good_status) = 0")
 	}
 	offset := (page - 1) * limit
@@ -2916,7 +2916,7 @@ func GetDrugNewPurchaseStockQuery(good_type int64, keyword string, page int64, l
 	if good_type > 0 {
 		db = db.Where("drug_type = ?", good_type)
 	}
-	if orgid == 10697 {
+	if orgid == 10697 || orgid == 10644 {
 		db = db.Where("find_in_set('停用',drug_status) = 0")
 	}
 

service/stock_service.go

@@ -9793,7 +9793,7 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 		db = db.Where("is_upload = 1")
 	}
 	if is_sale == 2 {
-		db = db.Where("is_upload = 2")
+		db = db.Where("is_upload = 2 or is_upload =0")
 	}
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error