11月9日库存管理

conf/app.conf

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

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -292,6 +292,7 @@ func (this *NewDialysisApiController) SavePatient() {
 			RegistrarsId:      adminInfo.AdminUser.Id,
 			RelativePhone:     relative_phone,
 			Remark:            remark,
+			SchRemark:         remark,
 		}
 		err = service.CreateOldPatient(&patients)
 		fmt.Print("报错", err)
@@ -334,6 +335,7 @@ func (this *NewDialysisApiController) SavePatient() {
 			RegistrarsId:      adminInfo.AdminUser.Id,
 			RelativePhone:     relative_phone,
 			Remark:            remark,
+			SchRemark:         remark,
 		}
 		err = service.CreateNewPatient(&patientsNew)
 		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.ID, 10) + ":patient_info"
@@ -401,6 +403,7 @@ func (this *NewDialysisApiController) SavePatient() {
 					IdCardNo:          idCard,
 					EquitmentId:       requipmentId,
 					Remark:            remark,
+					SchRemark:         remark,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				if err != nil {
@@ -461,6 +464,8 @@ func (this *NewDialysisApiController) SavePatient() {
 								MemberPatienttype: patient_type,
 								MemberTreatement:  treatmentmethod,
 								RelativePhone:     relative_phone,
+								SchRemark:         remark,
+								Remark:            remark,
 							}
 							err = service.CreateNewPatient(&patientsNew)
 							fmt.Print("报错", err)
@@ -548,6 +553,7 @@ func (this *NewDialysisApiController) SavePatient() {
 					MemberTreatement:  treatmentmethod,
 					RelativePhone:     relative_phone,
 					Remark:            remark,
+					SchRemark:         remark,
 				}
 				err = service.CreateNewPatient(&patientsNew)
 				fmt.Print("报错", err)
@@ -1387,6 +1393,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			OutReason:         out_reason,
 			RelativePhone:     relative_phone,
 			Remark:            remark,
+			SchRemark:         remark,
 		}
 		err = service.UpdatedPatient(patients, patient.BloodId)
 		key := strconv.FormatInt(orgid, 10) + ":" + strconv.FormatInt(patient.BloodId, 10) + ":patient_info"
@@ -1418,6 +1425,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
 			Remark:            remark,
+			SchRemark:         remark,
 		}
 		err = service.UpdateXtPatientNew(patientsNew, id)
 		if err != nil {
@@ -1477,6 +1485,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
 			Remark:            remark,
+			SchRemark:         remark,
 		}
 		err = service.UpdateXtPatientNew(xtPatientsNew, id)
 		fmt.Print("更新失败", err)
@@ -1535,6 +1544,7 @@ func (this *NewDialysisApiController) UpdatedPatient() {
 			DeathTime:         death_time,
 			RelativePhone:     relative_phone,
 			Remark:            remark,
+			SchRemark:         remark,
 		}
 		err = service.UpdateXtPatientNewOne(patientsNew, id)
 		if err != nil {

controllers/patient_api_controller.go

@@ -485,7 +485,6 @@ func (c *PatientApiController) EditPatient() {
 	patient.UpdatedTime = time.Now().Unix()
 	patient.IsInfectious = is_infectious
 	patient.RemindCycle = remind_cycle
-	fmt.Println("hhhhh2h32322323332323232323232322323", patient.RemindCycle)
 	err := service.UpdatePatient(&patient, contagions, diseases)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdatePatient)
@@ -581,6 +580,7 @@ func (c *PatientApiController) EditPatient() {
 		BloodPatients:             1,
 		Lapseto:                   patient.Lapseto,
 		TrobleShoot:               patient.TrobleShoot,
+		SchRemark:                 patient.SchRemark,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)

service/new_warehouse_service.go

@@ -83,6 +83,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			StorehouseId:            goods.StorehouseId,
 			IsCheck:                 1,
 			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
 		}
 		warehouseOutInfo.Count = count
 		if orgID == 9671 || orgID == 10265 {
@@ -156,6 +157,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				StorehouseId:            goods.StorehouseId,
 				OverCount:               sum_count,
 				BuyPrice:                warehouse.Price,
+				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
@@ -270,6 +272,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				BuyPrice:                warehouse.Price,
 				ProjectId:               goods.ProjectId,
 				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
@@ -348,6 +351,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			StorehouseId:            goods.StorehouseId,
 			IsCheck:                 1,
 			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
 		}
 		warehouseOutInfo.Count = stock_number
 		if orgID == 9671 || orgID == 10265 {
@@ -413,6 +417,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				StorehouseId:            goods.StorehouseId,
 				OverCount:               sum_count,
 				BuyPrice:                warehouse.Price,
+				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
@@ -523,6 +528,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 				BuyPrice:                warehouse.Price,
 				ProjectId:               goods.ProjectId,
 				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
 			}
 			if orgID == 9671 || orgID == 10265 {
 				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)

service/patient_service.go

@@ -830,7 +830,7 @@ func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot}).Error
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark}).Error
 	return err
 }
 

service/patientmanage_service.go

@@ -950,14 +950,14 @@ func GetNewPatient(id int64) (models.XtPatientsNew, error) {
 
 func UpdatedPatient(patients models.Patients, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark, "sch_remark": patients.SchRemark}).Error
 
 	return err
 }
 
 func UpdateXtPatientNew(patients models.XtPatientsNew, id int64) error {
 
-	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark}).Error
+	err := XTWriteDB().Model(&patients).Where("id=?", id).Update(map[string]interface{}{"name": patients.Name, "gender": patients.Gender, "birthday": patients.Birthday, "age": patients.Age, "phone": patients.Phone, "lapseto": patients.Lapseto, "admission_number": patients.AdmissionNumber, "first_dialysis_date": patients.FirstDialysisDate, "diagnose": patients.Diagnose, "source": patients.Source, "dialysis_no": patients.DialysisNo, "avatar": patients.Avatar, "id_card_no": patients.IdCardNo, "is_infectious": patients.IsInfectious, "out_reason": patients.OutReason, "death_time": patients.DeathTime, "relative_phone": patients.RelativePhone, "remark": patients.Remark, "sch_remark": patients.SchRemark}).Error
 
 	return err
 }