历史排班

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -9826,7 +9826,7 @@ func (c *DialysisAPIController) GetAdviceListNoExecution() {
 	orgId := c.GetMobileAdminUserInfo().Org.Id
 
 	//查询当前护士的患者
-	orderList, _ := service.GetDialysisOrderNoExecution(admin_user_id, orgId)
+	orderList, _ := service.GetDialysisOrderNoExecution(admin_user_id, orgId, timenow)
 	var patientIds []int64
 
 	for _, item := range orderList {

controllers/pharmacy_controller.go

@@ -104,6 +104,7 @@ func (this *PharmacyController) TodayNumber() {
 		var itotal int
 		itotal, err = service.GetTodayPharmacy(stime, etime, orgid, 0)
 
+		drug, _ := service.GetAllBaseDrugList(orgid)
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -112,6 +113,7 @@ func (this *PharmacyController) TodayNumber() {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"wtotal": wtotal,
 			"itotal": itotal,
+			"drug":   drug,
 		})
 		return
 	}
@@ -123,9 +125,11 @@ func (this *PharmacyController) TodayNumber() {
 		wtotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 1)
 
 		itotal, _ = service.GetTodayAdviceCount(stime, etime, orgid, 0)
+		drug, _ := service.GetAllBaseDrugList(orgid)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"wtotal": wtotal,
 			"itotal": itotal,
+			"drug":   drug,
 		})
 		return
 	}

controllers/secondary_order_api_contorller.go

@@ -609,6 +609,8 @@ func (this *SecondaryOrderApiController) SaveSencondOrder() {
 
 				min_price := items["min_price"].(float64)
 
+				medical_insurance_number := items["medical_insurance_number"].(string)
+
 				info := &models.XtSecondWarehouseInfo{
 					ProjectName:             project_name,
 					SecondSpecificationName: second_specification_name,
@@ -630,6 +632,7 @@ func (this *SecondaryOrderApiController) SaveSencondOrder() {
 					MinPrice:                min_price,
 					IsSource:                is_source,
 					WarehouseId:             secondWarehouse.ID,
+					MedicalInsuranceNumber:  medical_insurance_number,
 				}
 
 				warehousingInfo = append(warehousingInfo, info)

models/pharmacy_models.go

@@ -55,6 +55,7 @@ type PharmacyContent struct {
 	Doctor       string //开立医生
 	DataSources  string //数据来源
 	Remarks      string //备注
+	DrugId       int64
 }
 
 // 发药明细列表
@@ -254,6 +255,7 @@ type XtDoctorAdviceL struct {
 	IsMedicine            int64   `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
 	People                int64   `gorm:"column:people" json:"people" form:"people"`
 	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 }
 
 func (XtDoctorAdviceL) TableName() string {

models/secondary_models.go

@@ -179,6 +179,7 @@ type XtSecondWarehouseInfo struct {
 	MinPrice                float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
 	WarehouseId             int64   `gorm:"column:warehouse_id" json:"warehouse_id" form:"warehouse_id"`
+	MedicalInsuranceNumber  string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (XtSecondWarehouseInfo) TableName() string {

models/supply.models.go

@@ -19,25 +19,26 @@ func (SpSupplierContacts) TableName() string {
 }
 
 type SpBaseDrug struct {
-	ID                int64                  `gorm:"column:id" json:"id" form:"id"`
-	DrugName          string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	DrugCategory      int64                  `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec          string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType          int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	MaxUnit           string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber         int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit           string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose              string                 `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit          string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	DrugDose          float64                `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit      int64                  `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	Manufacturer      int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	OrgId             int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Number            string                 `gorm:"column:number" json:"number" form:"number"`
-	LastPrice         float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugWarehouseInfo []*SpDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
-	DrugStatus        string                 `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
-	MinPrice          float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
+	DrugName               string                 `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugCategory           int64                  `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec               string                 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType               int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	MaxUnit                string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber              int64                  `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                   string                 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit               string                 `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	DrugDose               float64                `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit           int64                  `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	Manufacturer           int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId                  int64                  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Number                 string                 `gorm:"column:number" json:"number" form:"number"`
+	LastPrice              float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugWarehouseInfo      []*SpDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	DrugStatus             string                 `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	MinPrice               float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	MedicalInsuranceNumber string                 `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (SpBaseDrug) TableName() string {
@@ -45,19 +46,20 @@ func (SpBaseDrug) TableName() string {
 }
 
 type SpGoodInformation struct {
-	ID                int64              `gorm:"column:id" json:"id" form:"id"`
-	SpecificationName string             `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId        int64              `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	GoodUnit          int64              `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	Manufacturer      int64              `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	OrgId             int64              `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	GoodName          string             `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	PackingUnit       string             `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	BuyPrice          float64            `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	GoodStatus        string             `gorm:"column:good_status" json:"good_status" form:"good_status"`
-	GoodWarehouseInfo []*SpWarehouseInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_warehouse_info"`
-	Number            string             `gorm:"column:number" json:"number" form:"number"`
-	RetailPrice       float64            `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	ID                     int64              `gorm:"column:id" json:"id" form:"id"`
+	SpecificationName      string             `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId             int64              `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit               int64              `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	Manufacturer           int64              `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	OrgId                  int64              `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName               string             `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	PackingUnit            string             `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	BuyPrice               float64            `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	GoodStatus             string             `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	GoodWarehouseInfo      []*SpWarehouseInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_warehouse_info"`
+	Number                 string             `gorm:"column:number" json:"number" form:"number"`
+	RetailPrice            float64            `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber string             `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 func (SpGoodInformation) TableName() string {

service/patient_service.go

@@ -3209,9 +3209,9 @@ func CreateDeviceValusalMapVrr(vrr models.XtDeviceValusalMapVrr) error {
 	return err
 }
 
-func GetDialysisOrderNoExecution(start_nurse int64, user_org_id int64) (order []*models.XtDialysisOrder, err error) {
+func GetDialysisOrderNoExecution(start_nurse int64, user_org_id int64, timenow int64) (order []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("start_nurse = ? and user_org_id =? and status =1", start_nurse, user_org_id).Find(&order).Error
+	err = XTReadDB().Where("start_nurse = ? and user_org_id =? and status =1 and dialysis_date =?", start_nurse, user_org_id, timenow).Find(&order).Error
 	return order, err
 }
 

service/pharmacy_service.go

@@ -274,6 +274,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 			Doctor:       GetAdminUserName(v.AdviceDoctor, orgid), //开立医生
 			DataSources:  "his处方",
 			Remarks:      v.Remark, //备注
+			DrugId:       v.DrugId,
 		})
 	}
 
@@ -303,6 +304,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 			Doctor:       GetAdminUserName(v.AdviceDoctor, orgid),
 			DataSources:  "临时医嘱",
 			Remarks:      v.Remark,
+			DrugId:       v.DrugId,
 		})
 	}
 	return