controllers/pharmacy_controller.go

@@ -189,11 +189,16 @@ func (this *PharmacyController) IssuedDrug() {
 	fmt.Println(partition)
 	w_his_advice_patient, _ := service.GetWaitPharmacyHISAdvicePatient(partition, shift, stime, orgid, keyword, is_medicine)
 	w_xt_advice_patient, _ := service.GetWaitPharmacyXTPatient(partition, shift, stime, orgid, keyword, is_medicine)
-	w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
 	var patients []*models.PharmacyPatients
 	patients = append(patients, w_his_advice_patient...)
 	patients = append(patients, w_xt_advice_patient...)
-	patients = append(patients, w_his_goods_patient...)
+
+	//good_info,_ := service.GetGoodCodeOpen(orgid)
+	good_info, _ := service.GetGoodCodeOpen(orgid)
+	if good_info.IsOpen == 1 {
+		w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
+		patients = append(patients, w_his_goods_patient...)
+	}
 	patients = RemoveRepeatedPurviewElement(patients)
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -273,11 +278,16 @@ func (this *PharmacyController) WaitingDrug() {
 	is_medicine := 0
 	w_his_advice_patient, _ := service.GetWaitPharmacyHISAdvicePatient(partition, shift, stime, orgid, keyword, is_medicine)
 	w_xt_advice_patient, _ := service.GetWaitPharmacyXTPatient(partition, shift, stime, orgid, keyword, is_medicine)
-	w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
+
 	var patients []*models.PharmacyPatients
 	patients = append(patients, w_his_advice_patient...)
 	patients = append(patients, w_xt_advice_patient...)
-	patients = append(patients, w_his_goods_patient...)
+
+	good_info, _ := service.GetGoodCodeOpen(orgid)
+	if good_info.IsOpen == 1 {
+		w_his_goods_patient, _ := service.GetWaitPharmacyHISGoodsPatient(partition, shift, stime, orgid, keyword, is_medicine)
+		patients = append(patients, w_his_goods_patient...)
+	}
 	patients = RemoveRepeatedPurviewElement(patients)
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -1417,7 +1427,6 @@ func (this *PharmacyController) ChangeDrugCode() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	data_source, _ := this.GetInt64("data_source")
 	drug_code := this.GetString("drug_code")
-	//item_type := this.GetString("type")
 
 	str := strings.Replace(drug_code, " ", "", -1)
 	// 去除换行符

models/stock_models.go

@@ -1867,6 +1867,19 @@ func (XtDrugCodeOpen) TableName() string {
 	return "xt_drug_code_open"
 }
 
+type XtGoodCodeOpen struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtGoodCodeOpen) TableName() string {
+	return "xt_good_code_open"
+}
+
 type PrintWarehousingInfo struct {
 	ID                        int64   `gorm:"column:id" json:"id"`
 	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id"`

service/export_data_service.go

@@ -303,29 +303,31 @@ type MedicalChargesThree struct {
 	XtCount                  float64 `gorm:"column:血透"`
 	XlCount                  float64 `gorm:"column:血滤"`
 	GlCount                  float64 `gorm:"column:灌流"`
-	WesternMedicineFee       float64 `gorm:"column:西药费"`    // 西药费
-	ChinesePatentMedicineFee float64 `gorm:"column:中成药费"`   // 中成药费
-	HealthMaterialsFee       float64 `gorm:"column:耗材费"`    // 卫生材料费
-	RegistrationFee          float64 `gorm:"column:挂号费"`    // 挂号费
-	TreatmentFee             float64 `gorm:"column:治疗费"`    // 治疗费
-	ExaminationFee           float64 `gorm:"column:检查费"`    // 检查费
-	LaboratoryFee            float64 `gorm:"column:化验费"`    // 化验费
-	NursingFee               float64 `gorm:"column:护理费"`    // 护理费
-	OtherFee                 float64 `gorm:"column:其他费"`    // 其他费
-	BedsFee                  float64 `gorm:"column:床位费"`    // 床位费
-	ConsultationFee          float64 `gorm:"column:诊察费"`    // 诊察费
-	ChineseMedicineFee       float64 `gorm:"column:中药饮片费"`  // 中药饮片费
-	GeneralTreatmentFee      float64 `gorm:"column:一般诊疗费"`  // 一般诊疗费
-	TotalMedicalFee          float64 `gorm:"column:合计"`     // 医疗费总额
-	SelfPay                  float64 `gorm:"column:自费金额"`   // 个人自付金额
-	AcctPay                  float64 `gorm:"column:个人账户支付"` // 基本账户支付
-	Return                   string  `gorm:"column:退费"`     // 共济账户支付
-	YouHui                   string  `gorm:"column:优惠"`     // 公务员补助
-	YingShou                 float64 `gorm:"column:应收"`     // 统筹支付金额
-	GuaZhang                 string  `gorm:"column:挂账"`     // 医疗救助
-	ChongZhang               string  `gorm:"column:冲账"`     // 大病支付
-	ShiShou                  float64 `gorm:"column:实收"`     // 企业补充支付
-	YiShou                   float64 `gorm:"column:已收"`     // 重大疾病补充 (Empty in SQL, will be left blank in Go)
+	WesternMedicineFee       float64 `gorm:"column:西药费"`      // 西药费
+	ChinesePatentMedicineFee float64 `gorm:"column:中成药费"`     // 中成药费
+	HealthMaterialsFee       float64 `gorm:"column:耗材费"`      // 卫生材料费
+	RegistrationFee          float64 `gorm:"column:挂号费"`      // 挂号费
+	TreatmentFee             float64 `gorm:"column:治疗费"`      // 治疗费
+	ExaminationFee           float64 `gorm:"column:检查费"`      // 检查费
+	LaboratoryFee            float64 `gorm:"column:化验费"`      // 化验费
+	NursingFee               float64 `gorm:"column:护理费"`      // 护理费
+	OtherFee                 float64 `gorm:"column:其他费"`      // 其他费
+	BedsFee                  float64 `gorm:"column:床位费"`      // 床位费
+	ConsultationFee          float64 `gorm:"column:诊察费"`      // 诊察费
+	ChineseMedicineFee       float64 `gorm:"column:中药饮片费"`    // 中药饮片费
+	GeneralTreatmentFee      float64 `gorm:"column:一般诊疗费"`    // 一般诊疗费
+	TotalMedicalFee          float64 `gorm:"column:合计"`       // 医疗费总额
+	TC                       float64 `gorm:"column:医保统筹基金支出"` // 医疗费总额
+	Func                     float64 `gorm:"column:医保基金支付金额"` // 医疗费总额
+	SelfPay                  float64 `gorm:"column:自费金额"`     // 个人自付金额
+	AcctPay                  float64 `gorm:"column:个人账户支付"`   // 基本账户支付
+	Return                   string  `gorm:"column:退费"`       // 共济账户支付
+	YouHui                   string  `gorm:"column:优惠"`       // 公务员补助
+	YingShou                 float64 `gorm:"column:应收"`       // 统筹支付金额
+	GuaZhang                 string  `gorm:"column:挂账"`       // 医疗救助
+	ChongZhang               string  `gorm:"column:冲账"`       // 大病支付
+	ShiShou                  float64 `gorm:"column:实收"`       // 企业补充支付
+	YiShou                   float64 `gorm:"column:已收"`       // 重大疾病补充 (Empty in SQL, will be left blank in Go)
 }
 
 func GetHisOrderBy10697Summary(start_time string, end_time string, ins string) (results []MedicalCharges, err error) {
@@ -495,6 +497,7 @@ func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_sta
 		PsnCashPay   float64
 		AcctPay      float64
 		FunPay       float64
+		TcPay        float64
 	}
 
 	// To store totals per patient
@@ -507,6 +510,7 @@ func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_sta
 		err := readDb.Model(models.HisOrder{}).
 			Select("sum(medfee_sumamt) as medfee_sumamt, "+
 				"sum(psn_cash_pay) as psn_cash_pay, "+
+				"sum(hifp_pay) as tc_pay, "+
 				"sum(acct_pay) as acct_pay, "+
 				"sum(fund_pay_sumamt) as fun_pay").
 			Where("patient_id = ? and user_org_id = ? "+
@@ -529,6 +533,8 @@ func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_sta
 		grandTotal.PsnCashPay += tempTotal.PsnCashPay
 		grandTotal.AcctPay += tempTotal.AcctPay
 		grandTotal.FunPay += tempTotal.FunPay
+		grandTotal.TcPay += tempTotal.TcPay
+
 	}
 
 	// Print totals per patient
@@ -542,6 +548,8 @@ func GetHisOrderBy10697SummaryThree(startTime, endTime string, st_stamp, end_sta
 				item.YingShou = total.MedfeeSumamt
 				item.ShiShou = total.MedfeeSumamt
 				item.YiShou = total.PsnCashPay
+				item.Func = total.FunPay
+				item.TC = total.TcPay
 				fmt.Println(item)
 			}
 

service/stock_service.go

@@ -11007,6 +11007,13 @@ func GetDrugCodeOpen(user_org_id int64) (models.XtDrugCodeOpen, error) {
 	return drugCodeOpen, err
 }
 
+func GetGoodCodeOpen(user_org_id int64) (models.XtGoodCodeOpen, error) {
+
+	drugCodeOpen := models.XtGoodCodeOpen{}
+	err := XTReadDB().Where("user_org_id = ? and status=1", user_org_id).Find(&drugCodeOpen).Error
+	return drugCodeOpen, err
+}
+
 func CreateDrugOpen(open models.XtDrugCodeOpen) error {
 
 	err := XTWriteDB().Create(&open).Error