11月9日库存管理

controllers/dialysis_api_controller.go

@@ -1501,7 +1501,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	urea_befor := c.GetString("urea_befor")
 	suction := c.GetString("suction")
 	weight_befor_remake := c.GetString("weight_befor_remake")
-
+	height := c.GetString("height")
+	age := c.GetString("age")
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1571,6 +1572,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		UreaBefor:                      urea_befor,
 		Suction:                        suction,
 		WeightBeforRemake:              weight_befor_remake,
+		Height:                         height,
+		Age:                            age,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)

controllers/doctors_api_controller.go

@@ -211,8 +211,10 @@ func (c *DoctorsApiController) GetAllAdminUsers() {
 
 	adminUserInfo := c.GetAdminUserInfo()
 	users, _ := service.GetAllAdminUsersTwo(adminUserInfo.CurrentOrgId)
+	operators, _ := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"users": users,
+		"users":     users,
+		"operators": operators,
 	})
 	return
 }

controllers/his_config_api_controller.go

@@ -27,6 +27,7 @@ const (
 
 func HisConfigApiRegistRouters() {
 	beego.Router("/api/his/patient/list", &HisConfigApiController{}, "get:GetAllHisPatientsList")
+	beego.Router("/api/his/patient/getpatientlisttwenty", &HisConfigApiController{}, "get:GetPatientListTwenty")
 	beego.Router("/api/his/prescriptiontemplate/list", &HisConfigApiController{}, "get:GetPrescriptionTemplateList")
 	beego.Router("/api/his/prescriptiontemplate/info", &HisConfigApiController{}, "get:GetPrescriptionTemplateInfo")
 	beego.Router("/api/his/prescriptiontemplate/create", &HisConfigApiController{}, "post:CreatePrescriptionTemplate") //批量添加
@@ -66,6 +67,13 @@ func (c *HisConfigApiController) GetAllHisPatientsList() {
 	})
 }
 
+func (c *HisConfigApiController) GetPatientListTwenty() {
+	patients, _, _ := service.GetAllPatientListTwenty(c.GetAdminUserInfo().CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": patients,
+	})
+}
+
 func (c *HisConfigApiController) GetPrescriptionTemplateList() {
 	patient_id, _ := c.GetInt64("patient_id", 0)
 	page, _ := c.GetInt64("page", 0)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -5127,6 +5127,7 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 
 	project, _ := service.GetHisPrescriptionProject(adminUser.Org.Id, patient_id, date.Unix())
 
+	_, config := service.FindXTHisRecordByOrgId(adminUser.Org.Id)
 	//获取当天该病人的透析处方
 	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
 	good_info, _ := service.FindAllGoodInfo(adminUser.Org.Id)
@@ -5150,6 +5151,7 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 			"prescribe":        prescribe,
 			"good_info":        good_info,
 			"warehouseOutList": warehouseOutList,
+			"config":           config,
 		})
 		return
 
@@ -5176,6 +5178,7 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				"good_info":        good_info,
 				"project":          project,
 				"warehouseOutList": warehouseOutList,
+				"config":           config,
 			})
 			return
 
@@ -5250,6 +5253,8 @@ func (c *DialysisAPIController) GetStockInGoodInfo() {
 	prescribe, parseDateErr := service.GetDialysisPrescribe(adminUser.Org.Id, patient_id, date.Unix())
 
 	outInfo, _ := service.GetGoodWarehouseOutInfo(adminUser.Org.Id, patient_id, date.Unix())
+
+	_, configs := service.FindXTHisRecordByOrgId(adminUser.Org.Id)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"good_type":      goodTypes,
 		"good_user":      goodUser,
@@ -5258,6 +5263,7 @@ func (c *DialysisAPIController) GetStockInGoodInfo() {
 		"project":        project,
 		"prescription":   prescribe,
 		"outInfo":        outInfo,
+		"configs":        configs,
 	})
 	return
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2766,6 +2766,18 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		evaluation.WeightBeforRemake = weight_befor_remake
 	}
+
+	if dataBody["height"] != nil && reflect.TypeOf(dataBody["height"]).String() == "string" {
+		height := dataBody["height"].(string)
+
+		evaluation.Height = height
+	}
+
+	if dataBody["age"] != nil && reflect.TypeOf(dataBody["age"]).String() == "string" {
+		age := dataBody["age"].(string)
+
+		evaluation.Age = age
+	}
 	return
 }
 

controllers/patient_api_controller.go

@@ -365,6 +365,7 @@ func (c *PatientApiController) CreatePatient() {
 		UserSysBeforeCount:           patient.UserSysBeforeCount,
 		TrobleShoot:                  patient.TrobleShoot,
 		TreatmentPlan:                patient.TreatmentPlan,
+		Doctor:                       patient.Doctor,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -4447,6 +4448,11 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		treatment_plan := patientBody["treatment_plan"].(string)
 		patient.TreatmentPlan = treatment_plan
 	}
+
+	if patientBody["doctor"] != nil && reflect.TypeOf(patientBody["doctor"]).String() == "float64" {
+		doctor := int64(patientBody["doctor"].(float64))
+		patient.Doctor = doctor
+	}
 	return
 }
 

models/dialysis.go

@@ -321,6 +321,8 @@ type PredialysisEvaluation struct {
 	UreaBefor                      string  `gorm:"column:urea_befor" json:"urea_befor" form:"urea_befor"`
 	Suction                        string  `gorm:"column:suction" json:"suction" form:"suction"`
 	WeightBeforRemake              string  `gorm:"column:weight_befor_remake" json:"weight_befor_remake" form:"weight_befor_remake"`
+	Height                         string  `gorm:"column:height" json:"height" form:"height"`
+	Age                            string  `gorm:"column:age" json:"age" form:"age"`
 }
 
 func (PredialysisEvaluation) TableName() string {

models/patient_models.go

@@ -192,6 +192,7 @@ type Patients struct {
 	DryWeight                float64 `gorm:"-"`
 	ZbPatientId              string  `gorm:"column:zb_patient_id" json:"zb_patient_id" form:"zb_patient_id"`
 	TreatmentPlan            string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
+	Doctor                   int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 }
 
 func (Patients) TableName() string {
@@ -749,6 +750,7 @@ type XtPatientsNew struct {
 	DeathTime                    int64   `gorm:"column:death_time" json:"death_time" form:"death_time"`
 	TrobleShoot                  int64   `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
+	Doctor                       int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 }
 
 func (XtPatientsNew) TableName() string {

service/new_warehouse_service.go

@@ -2070,6 +2070,6 @@ func FindeGoodInfo(orgid int64, id int64) (models.GoodInformation, error) {
 func UpdateHisPrescriptionProjectStatus(project_id int64, record_time int64, user_org_id int64, patient_id int64) (models.HisPrescriptionProject, error) {
 
 	project := models.HisPrescriptionProject{}
-	err := XTWriteDB().Model(&project).Where("project_id  = ? and record_date = ? and user_org_id = ? and patient_id = ? and status = 1", project_id, record_time, user_org_id, patient_id).Update(map[string]interface{}{"is_out": 2}).Error
+	err := XTWriteDB().Model(&project).Where("project_id  = ? and record_date = ? and user_org_id = ? and patient_id = ? and status = 1", project_id, record_time, user_org_id, patient_id).Update(map[string]interface{}{"is_out": 1}).Error
 	return project, err
 }

service/patient_service.go

@@ -80,6 +80,14 @@ func GetAllPatientList(orgID int64) (patients []*models.Patients, total int64, e
 	return
 }
 
+func GetAllPatientListTwenty(orgID int64) (patients []*models.Patients, total int64, err error) {
+
+	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1 and p.lapseto = 1", orgID)
+
+	err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Count(&total).Find(&patients).Error
+	return
+}
+
 func GetAllPatientListSix(orgID int64) (patients []*models.MSchedualPatientList, err error) {
 
 	err = XTReadDB().Model(&patients).Where("user_org_id = ? and status = 1", orgID).Find(&patients).Error