耗材参数

controllers/mobile_api_controllers/patient_api_controller.go

@@ -956,15 +956,71 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 			for _, item := range advices {
 				if item.ExecutionState == 2 {
-					advice = item
+					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 
+					timeStr := time.Now().Format("2006-01-02")
+					timeArr := strings.Split(timeStr, "-")
+					total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
+
+					total = total + 1
+					warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+					number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+					number = number + total
+					warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+					//插入自备药出库单
+					outStock := models.XtSelfOutStock{
+						DrugName:       item.AdviceName,
+						DrugNameId:     item.DrugId,
+						DrugSpec:       item.AdviceDesc,
+						OutstoreNumber: count,
+						AdminUserId:    adminUserInfo.AdminUser.Id,
+						StorckTime:     item.AdviceDate,
+						UserOrgId:      adminUserInfo.Org.Id,
+						CreatedTime:    time.Now().Unix(),
+						Status:         1,
+						PatientId:      item.PatientId,
+						ExitMode:       2,
+						MedicId:        item.DrugId,
+						StockOutNumber: warehousing_out_order,
+					}
+					service.CreateOutStock(&outStock)
 				}
 			}
 		} else {
+
 			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			for _, item := range advices {
-				if item.ExecutionState == 2 {
-					advice = item
+				if item.ExecutionState == 1 {
+					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
+
+					timeStr := time.Now().Format("2006-01-02")
+					timeArr := strings.Split(timeStr, "-")
+					total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
+
+					total = total + 1
+					warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+					number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+					number = number + total
+					warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+					//插入自备药出库单
+					outStock := models.XtSelfOutStock{
+						DrugName:       item.AdviceName,
+						DrugNameId:     item.DrugId,
+						DrugSpec:       item.AdviceDesc,
+						OutstoreNumber: count,
+						AdminUserId:    adminUserInfo.AdminUser.Id,
+						StorckTime:     item.AdviceDate,
+						UserOrgId:      adminUserInfo.Org.Id,
+						CreatedTime:    time.Now().Unix(),
+						Status:         1,
+						PatientId:      item.PatientId,
+						ExitMode:       2,
+						MedicId:        item.DrugId,
+						StockOutNumber: warehousing_out_order,
+					}
+					service.CreateOutStock(&outStock)
 
 				}
 			}

controllers/patient_api_controller.go

@@ -254,29 +254,29 @@ func (c *PatientApiController) CreatePatient() {
 	//获取老表的最后一条数据
 	patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          adminUserInfo.CurrentOrgId,
-		UserId:             0,
-		Avatar:             patients.Avatar,
-		PatientType:        patients.PatientType,
-		DialysisNo:         patients.DialysisNo,
-		AdmissionNumber:    patients.AdmissionNumber,
-		Source:             patients.Source,
-		Lapseto:            patients.Lapseto,
-		PartitionId:        patients.PartitionId,
-		BedId:              patients.BedId,
-		Name:               patients.Name,
-		Alias:              patients.Alias,
-		Gender:             patients.Gender,
-		MaritalStatus:      patients.MaritalStatus,
-		IdCardNo:           patients.IdCardNo,
-		Birthday:           patients.Birthday,
-		ReimbursementWayId: patients.ReimbursementWayId,
-		HealthCareType:     patients.HealthCareType,
-		HealthCareNo:       patients.HealthCareNo,
-		HealthCareDueDate:  patients.HealthCareDueDate,
-		Height:             patients.Height,
-		BloodType:          patients.BloodType,
-		Rh:                 patients.Rh,
+		UserOrgId:                    adminUserInfo.CurrentOrgId,
+		UserId:                       0,
+		Avatar:                       patients.Avatar,
+		PatientType:                  patients.PatientType,
+		DialysisNo:                   patients.DialysisNo,
+		AdmissionNumber:              patients.AdmissionNumber,
+		Source:                       patients.Source,
+		Lapseto:                      patients.Lapseto,
+		PartitionId:                  patients.PartitionId,
+		BedId:                        patients.BedId,
+		Name:                         patients.Name,
+		Alias:                        patients.Alias,
+		Gender:                       patients.Gender,
+		MaritalStatus:                patients.MaritalStatus,
+		IdCardNo:                     patients.IdCardNo,
+		Birthday:                     patients.Birthday,
+		ReimbursementWayId:           patients.ReimbursementWayId,
+		HealthCareType:               patients.HealthCareType,
+		HealthCareNo:                 patients.HealthCareNo,
+		HealthCareDueDate:            patients.HealthCareDueDate,
+		Height:                       patients.Height,
+		BloodType:                    patients.BloodType,
+		Rh:                           patients.Rh,
 		HealthCareDueAlertDate:       patients.HealthCareDueAlertDate,
 		EducationLevel:               patients.EducationLevel,
 		Profession:                   patients.Profession,
@@ -322,28 +322,28 @@ func (c *PatientApiController) CreatePatient() {
 		Nation:                       patients.Nation,
 		NativePlace:                  patients.NativePlace,
 		Age:                          patients.Age,
-		InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
-		IsInfectious:             patients.IsInfectious,
-		RemindCycle:              patients.RemindCycle,
-		ResponseResult:           patients.ResponseResult,
-		IsOpenRemind:             patients.IsOpenRemind,
-		FirstTreatmentDate:       patients.FirstTreatmentDate,
-		DialysisAge:              patients.DialysisAge,
-		ExpenseKind:              patients.ExpenseKind,
-		TellPhone:                patients.TellPhone,
-		ContactName:              patients.ContactName,
-		BloodPatients:            1,
-		SlowPatients:             0,
-		MemberPatients:           0,
-		EcommerPatients:          "",
-		BloodId:                  patients.ID,
-		SlowId:                   0,
-		MemberId:                 0,
-		MemberFistdate:           0,
-		MemberPatienttype:        0,
-		MemberTreatement:         0,
-		EquitmentId:              "",
-		UserSysBeforeCount:       patient.UserSysBeforeCount,
+		InfectiousNextRecordTime:     patients.InfectiousNextRecordTime,
+		IsInfectious:                 patients.IsInfectious,
+		RemindCycle:                  patients.RemindCycle,
+		ResponseResult:               patients.ResponseResult,
+		IsOpenRemind:                 patients.IsOpenRemind,
+		FirstTreatmentDate:           patients.FirstTreatmentDate,
+		DialysisAge:                  patients.DialysisAge,
+		ExpenseKind:                  patients.ExpenseKind,
+		TellPhone:                    patients.TellPhone,
+		ContactName:                  patients.ContactName,
+		BloodPatients:                1,
+		SlowPatients:                 0,
+		MemberPatients:               0,
+		EcommerPatients:              "",
+		BloodId:                      patients.ID,
+		SlowId:                       0,
+		MemberId:                     0,
+		MemberFistdate:               0,
+		MemberPatienttype:            0,
+		MemberTreatement:             0,
+		EquitmentId:                  "",
+		UserSysBeforeCount:           patient.UserSysBeforeCount,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -481,28 +481,28 @@ func (c *PatientApiController) EditPatient() {
 		return
 	}
 	patientsNew := models.XtPatientsNew{
-		UserOrgId:          patient.UserOrgId,
-		UserId:             patient.UserId,
-		Avatar:             patient.Avatar,
-		PatientType:        patient.PatientType,
-		DialysisNo:         patient.DialysisNo,
-		AdmissionNumber:    patient.AdmissionNumber,
-		Source:             patient.Source,
-		PartitionId:        patient.PartitionId,
-		BedId:              patient.BedId,
-		Name:               patient.Name,
-		Alias:              patient.Alias,
-		Gender:             patient.Gender,
-		MaritalStatus:      patient.MaritalStatus,
-		IdCardNo:           patient.IdCardNo,
-		Birthday:           patient.Birthday,
-		ReimbursementWayId: patient.ReimbursementWayId,
-		HealthCareType:     patient.HealthCareType,
-		HealthCareNo:       patient.HealthCareNo,
-		HealthCareDueDate:  patient.HealthCareDueDate,
-		Height:             patient.Height,
-		BloodType:          patient.BloodType,
-		Rh:                 patient.Rh,
+		UserOrgId:                 patient.UserOrgId,
+		UserId:                    patient.UserId,
+		Avatar:                    patient.Avatar,
+		PatientType:               patient.PatientType,
+		DialysisNo:                patient.DialysisNo,
+		AdmissionNumber:           patient.AdmissionNumber,
+		Source:                    patient.Source,
+		PartitionId:               patient.PartitionId,
+		BedId:                     patient.BedId,
+		Name:                      patient.Name,
+		Alias:                     patient.Alias,
+		Gender:                    patient.Gender,
+		MaritalStatus:             patient.MaritalStatus,
+		IdCardNo:                  patient.IdCardNo,
+		Birthday:                  patient.Birthday,
+		ReimbursementWayId:        patient.ReimbursementWayId,
+		HealthCareType:            patient.HealthCareType,
+		HealthCareNo:              patient.HealthCareNo,
+		HealthCareDueDate:         patient.HealthCareDueDate,
+		Height:                    patient.Height,
+		BloodType:                 patient.BloodType,
+		Rh:                        patient.Rh,
 		HealthCareDueAlertDate:    patient.HealthCareDueAlertDate,
 		EducationLevel:            patient.EducationLevel,
 		Profession:                patient.Profession,
@@ -544,19 +544,19 @@ func (c *PatientApiController) EditPatient() {
 		Nation:                    patient.Nation,
 		NativePlace:               patient.NativePlace,
 		Age:                       patient.Age,
-		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
-		IsInfectious:             patient.IsInfectious,
-		RemindCycle:              patient.RemindCycle,
-		ResponseResult:           patient.ResponseResult,
-		IsOpenRemind:             patient.IsOpenRemind,
-		FirstTreatmentDate:       patient.FirstTreatmentDate,
-		DialysisAge:              patient.DialysisAge,
-		ExpenseKind:              patient.ExpenseKind,
-		TellPhone:                patient.TellPhone,
-		ContactName:              patient.ContactName,
-		UpdatedTime:              time.Now().Unix(),
-		BloodPatients:            1,
-		Lapseto:                  patient.Lapseto,
+		InfectiousNextRecordTime:  patient.InfectiousNextRecordTime,
+		IsInfectious:              patient.IsInfectious,
+		RemindCycle:               patient.RemindCycle,
+		ResponseResult:            patient.ResponseResult,
+		IsOpenRemind:              patient.IsOpenRemind,
+		FirstTreatmentDate:        patient.FirstTreatmentDate,
+		DialysisAge:               patient.DialysisAge,
+		ExpenseKind:               patient.ExpenseKind,
+		TellPhone:                 patient.TellPhone,
+		ContactName:               patient.ContactName,
+		UpdatedTime:               time.Now().Unix(),
+		BloodPatients:             1,
+		Lapseto:                   patient.Lapseto,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -1594,7 +1594,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			_, errcode := service.GetDrugWareseOut(theTime.Unix(), adminUserInfo.CurrentOrgId)
 			if errcode == gorm.ErrRecordNotFound {
 				timeArr := strings.Split(timeStr, "-")
-				total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+				total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
 
 				total = total + 1
 				warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
@@ -1618,7 +1618,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 
 			timeArr := strings.Split(timeStr, "-")
-			total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+			total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
 
 			total = total + 1
 			warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
@@ -1645,7 +1645,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			prescribingNumber := strconv.FormatFloat(math.Abs(adviceName.PrescribingNumber), 'f', 0, 64)
 			outStoreNumber, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 			timeArrs := strings.Split(timeStr, "-")
-			totals, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+			totals, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
 
 			totals = totals + 1
 			warehousing_out_orders := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArrs[0] + timeArrs[1] + timeArrs[2] + "000"
@@ -1664,15 +1664,15 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				OrgId:                   adminUserInfo.CurrentOrgId,
 				IsCancel:                2,
 				WarehouseOutOrderNumber: warehousing_out_order,
-				Type:          1,
-				Manufacturer:  orderOut.Manufacturer,
-				IsSys:         1,
-				SysRecordTime: theTime.Unix(),
+				Type:                    1,
+				Manufacturer:            orderOut.Manufacturer,
+				IsSys:                   1,
+				SysRecordTime:           theTime.Unix(),
 			}
 			service.CreateWareHouseOutInfo(&info)
 
 			timeArrss := strings.Split(timeStr, "-")
-			totalss, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+			totalss, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
 
 			totalss = totalss + 1
 			warehousing_out_orderss := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArrss[0] + timeArrss[1] + timeArrss[2] + "000"
@@ -1705,7 +1705,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			timeStr := time.Now().Format("2006-01-02")
 			timeArr := strings.Split(timeStr, "-")
-			total, _ := service.FindAllWarehouseOut(adminUserInfo.CurrentOrgId)
+			total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
 
 			total = total + 1
 			warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
@@ -1713,37 +1713,27 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			number = number + total
 			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
 
-			medicalName, errcode := service.GetSelfMedicalByDrugName(adviceName.AdviceName, adviceName.AdviceDesc, adviceName.PatientId)
-			if errcode == gorm.ErrRecordNotFound {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":    "ok",
-					"advice": advice,
-				})
-				return
-			} else if errcode == nil {
-				outStock := models.XtSelfOutStock{
-					DrugName:       adviceName.AdviceName,
-					DrugSpec:       adviceName.AdviceDesc,
-					OutstoreNumber: outStoreNumber,
-					AdminUserId:    adminUserInfo.AdminUser.Id,
-					CreatedTime:    time.Now().Unix(),
-					Status:         1,
-					PatientId:      adviceName.PatientId,
-					StockOutNumber: warehousing_out_order,
-					ExitMode:       2,
-					StorckTime:     adviceName.AdviceDate,
-					MedicId:        medicalName.ID,
-					DrugNameId:     medicalName.DrugNameId,
-					UserOrgId:      adminUserInfo.CurrentOrgId,
-				}
-				//创建出库单,自动出库
-				service.CreateOutStock(&outStock)
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg":    "ok",
-					"advice": advice,
-				})
-				return
+			outStock := models.XtSelfOutStock{
+				DrugName:       adviceName.AdviceName,
+				DrugSpec:       adviceName.AdviceDesc,
+				OutstoreNumber: outStoreNumber,
+				AdminUserId:    adminUserInfo.AdminUser.Id,
+				CreatedTime:    time.Now().Unix(),
+				Status:         1,
+				PatientId:      adviceName.PatientId,
+				StockOutNumber: warehousing_out_order,
+				ExitMode:       2,
+				StorckTime:     adviceName.AdviceDate,
+				MedicId:        adviceName.DrugId,
+				UserOrgId:      adminUserInfo.CurrentOrgId,
 			}
+			//创建出库单,自动出库
+			service.CreateOutStock(&outStock)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":    "ok",
+				"advice": advice,
+			})
+			return
 		}
 
 	}

controllers/self_drug_api_congtroller.go

@@ -88,12 +88,14 @@ func (this *SelfDrugApiController) SaveDrugName() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	drug_name := this.GetString("drug_name")
+	id, _ := this.GetInt64("id")
 	//fmt.Println("drug_name", drug_name)
 	drugName := models.XtDrugName{
 		UserOrgId:   orgId,
 		DrugName:    drug_name,
 		Status:      1,
 		CreatedTime: time.Now().Unix(),
+		DrugId:      id,
 	}
 	_, errcode := service.GetDrugName(drug_name, orgId)
 	if errcode == gorm.ErrRecordNotFound {
@@ -277,18 +279,25 @@ func (this *SelfDrugApiController) SaveSelfMedicines() {
 	for _, item := range medicineData {
 		items := item.(map[string]interface{})
 		drug_name := items["drug_name"].(string)
-		id := int64(items["id"].(float64))
+		drug_name_id := int64(items["drug_name_id"].(float64))
 		drug_spec := items["drug_spec"].(string)
 		min_unit := items["min_unit"].(string)
+
+		//根据drug_id
+		drugMedical, _ := service.GetBaseDrugMedical(drug_name_id)
 		medical := models.XtSelfMedical{
-			DrugName:    drug_name,
-			DrugNameId:  id,
-			DrugSpec:    drug_spec,
-			CreatedTime: time.Now().Unix(),
-			Status:      1,
-			UserOrgId:   orgId,
-			PatientId:   patient_id,
-			MinUnit:     min_unit,
+			DrugName:           drug_name,
+			DrugNameId:         drug_name_id,
+			DrugSpec:           drug_spec,
+			CreatedTime:        time.Now().Unix(),
+			Status:             1,
+			UserOrgId:          orgId,
+			PatientId:          patient_id,
+			MinUnit:            min_unit,
+			ExecutionFrequency: drugMedical.ExecutionFrequency,
+			PrescribingNumber:  drugMedical.PrescribingNumber,
+			DeliveryWay:        drugMedical.DeliveryWay,
+			SingleDose:         drugMedical.SingleDose,
 		}
 		//查询同个病人同个药品同个规格是否已存在
 		_, errcode := service.GetSelfMedicalByDrugName(drug_name, drug_spec, patient_id)
@@ -457,7 +466,7 @@ func (this *SelfDrugApiController) DeleteDrugById() {
 	orgId := adminUserInfo.CurrentOrgId
 
 	_, errcode := service.GetStandDrugByDrugName(drug_name, orgId)
-	fmt.Println("errcode", errcode)
+	fmt.Println("errcode2222222222222", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		service.DeleteDrugName(id)
 		returnData := make(map[string]interface{}, 0)

models/self_drug_models.go

@@ -76,7 +76,7 @@ type XtDrugName struct {
 	Status      int64  `gorm:"column:status" json:"status" form:"status"`
 	CreatedTime int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
 	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	ParentId    int64  `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	DrugId      int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 }
 
 func (XtDrugName) TableName() string {

service/self_drug_service.go

@@ -92,6 +92,12 @@ func GetRullerListByDrugName(drugname string, orgid int64) (rullername []*models
 	return rullername, err
 }
 
+func GetBaseDrugMedical(id int64) (models.XtBaseDrug, error) {
+	drug := models.XtBaseDrug{}
+	err := XTReadDB().Model(&drug).Where("id = ? and status = 1", id).Find(&drug).Error
+	return drug, err
+}
+
 func GetSelfMedicalByDrugName(drugname string, drug_spec string, patientid int64) (*models.XtSelfMedical, error) {
 	medical := models.XtSelfMedical{}
 	err := XTReadDB().Model(&medical).Where("drug_name = ? and drug_spec = ? and patient_id = ? and status = 1", drugname, drug_spec, patientid).Find(&medical).Error
@@ -140,8 +146,8 @@ func GetStandDrugByDrugName(drugname string, orgid int64) (*models.XtStandName,
 	return &standname, nil
 }
 
-func DeleteDrugName(id int64) (models.XtStandName, error) {
-	standName := models.XtStandName{}
+func DeleteDrugName(id int64) (models.XtSelfMedical, error) {
+	standName := models.XtSelfMedical{}
 	err := XTWriteDB().Model(&standName).Where("id = ?", id).Update(map[string]interface{}{"status": 0}).Error
 	return standName, err
 }