Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/his_api_controller.go

@@ -11452,6 +11452,9 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 
 	admin := c.GetAdminUserInfo()
 	his_patient_info, _ := service.GetNewHisPatientInfo(his_patient_id)
+
+	last_his_patient_info, _ := service.GetLastNewHisPatientInfo(patient_id, recordDateTime)
+
 	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
 
 	var prescriptions []*models.HisPrescription
@@ -11478,16 +11481,17 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 	sch, _ := service.GetScheduleByDate(c.GetAdminUserInfo().CurrentOrgId, recordDateTime, patient_id)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"his_info":     his_patient_info,
-		"xt_info":      xt_patient_info,
-		"prescription": prescriptions,
-		"case_history": case_history,
-		"info":         patientPrescriptionInfo,
-		"last_info":    lastPatientPrescriptionInfo,
-		"order":        order,
-		"doctors":      doctors,
-		"department":   department,
-		"sch":          sch,
+		"his_info":              his_patient_info,
+		"last_his_patient_info": last_his_patient_info,
+		"xt_info":               xt_patient_info,
+		"prescription":          prescriptions,
+		"case_history":          case_history,
+		"info":                  patientPrescriptionInfo,
+		"last_info":             lastPatientPrescriptionInfo,
+		"order":                 order,
+		"doctors":               doctors,
+		"department":            department,
+		"sch":                   sch,
 	})
 	return
 }

controllers/manager_center_api_controller.go

@@ -165,6 +165,8 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	is_show, _ := c.GetInt64("is_show")
 	adminInfo := c.GetAdminUserInfo()
 	is_self_drug, _ := c.GetInt64("is_self_drug")
+	is_zero_flag, _ := c.GetInt64("is_zero_flag")
+
 	specification_name := c.GetString("specification_name")
 	hans := drug_name // 要转换的汉字字符串
 
@@ -257,6 +259,7 @@ func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 		IsShow:                      is_show,
 		IsSelfDrug:                  is_self_drug,
 		SpecificationName:           specification_name,
+		IsZeroFlag:                  is_zero_flag,
 	}
 	drugLib.FirstLetter = firstLetter
 	drugLib.Pinyin = firstLetter
@@ -381,6 +384,8 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 	is_show, _ := c.GetInt64("is_show")
 	is_self_drug, _ := c.GetInt64("is_self_drug")
 	specification_name := c.GetString("specification_name")
+	is_zero_flag, _ := c.GetInt64("is_zero_flag")
+
 	adminInfo := c.GetAdminUserInfo()
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
 
@@ -478,6 +483,7 @@ func (c *ManagerCenterApiController) EditBaseDrugLib() {
 		IsShow:                      is_show,
 		IsSelfDrug:                  is_self_drug,
 		SpecificationName:           specification_name,
+		IsZeroFlag:                  is_zero_flag,
 	}
 	if adminInfo.CurrentOrgId == 10206 || adminInfo.CurrentOrgId == 10344 {
 
@@ -1643,6 +1649,8 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
 	is_show, _ := c.GetInt64("is_show")
+	is_zero_flag, _ := c.GetInt64("is_zero_flag")
+
 	adminUserInfo := c.GetAdminUserInfo()
 
 	totals := service.FindGoodInfoByNameTwo(specification_name, adminUserInfo.CurrentOrgId, good_id, good_name)
@@ -1726,6 +1734,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		ZuobiaoId:                   bbx01,
 		Bck01b:                      "55",
 		IsShow:                      is_show,
+		IsZeroFlag:                  is_zero_flag,
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1796,6 +1805,8 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	bbx01 := c.GetString("bbx01")
 	bby01 := c.GetString("bby01")
 	is_show, _ := c.GetInt64("is_show")
+	is_zero_flag, _ := c.GetInt64("is_zero_flag")
+
 	// 创建一个拼音转换器
 	p := pinyin.NewArgs()
 
@@ -1871,6 +1882,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		ZuobiaoId:                   bbx01,
 		Bck01b:                      "55",
 		IsShow:                      is_show,
+		IsZeroFlag:                  is_zero_flag,
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

models/drug.go

@@ -91,6 +91,7 @@ type BaseDrugLib struct {
 	IsShow             int64  `gorm:"column:is_show" json:"is_show" form:"is_show"`
 	IsSelfDrug         int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	SpecificationName  string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	IsZeroFlag         int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLib) TableName() string {
@@ -112,6 +113,7 @@ type BaseDrugLibSeven struct {
 	IsSelfDrug int64  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	Dose       string `gorm:"column:dose" json:"dose" form:"dose"`
 	DoseUnit   string `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	IsZeroFlag int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLibSeven) TableName() string {
@@ -135,6 +137,7 @@ type BaseDrugLibTwentyOne struct {
 	DoseUnit     string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	DrugDay      string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	MinPrice     float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsZeroFlag   int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLibTwentyOne) TableName() string {
@@ -151,6 +154,7 @@ type BaseDrugLibEleven struct {
 	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"`
+	IsZeroFlag       int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLibEleven) TableName() string {
@@ -163,6 +167,7 @@ type BaseDrugLibTen struct {
 	TotalCount          int64 `gorm:"column:total_count" json:"total_count" form:"total_count"`
 	DrugStockLimitCount int64 `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
 	Status              int64 `gorm:"column:status" json:"status" form:"status"`
+	IsZeroFlag          int64 `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLibTen) TableName() string {
@@ -280,6 +285,7 @@ type BaseDrugLibNight struct {
 	SumCount                    int64                   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SumInCount                  int64                   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	IsPharmacy                  int64                   `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	IsZeroFlag                  int64                   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLibNight) TableName() string {
@@ -299,6 +305,7 @@ type BaseDrugLibTwenty struct {
 	DrugStatus     string `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
 	DrugStockLimit string `gorm:"column:drug_stock_limit" json:"drug_stock_limit_count" form:"drug_stock_limit"`
 	Manufacturer   int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsZeroFlag     int64  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLibTwenty) TableName() string {
@@ -322,6 +329,7 @@ type BaseDrugLibThrity struct {
 	DrugType              int64                      `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
 	LastDrugWarehouseInfo XtSelfDrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"first_drug_warehouse_info"`
 	DrugWarehouseInfo     []*XtSelfDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	IsZeroFlag            int64                      `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLibThrity) TableName() string {

models/drug_pharmacy_management_models.go

@@ -74,6 +74,7 @@ type PharmacyBaseDrug struct {
 	SumInCount                  int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	IsPharmacy                  int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 	DrugWarehouseInfo           []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	IsZeroFlag                  int64                  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (PharmacyBaseDrug) TableName() string {

models/good_models.go

@@ -105,6 +105,7 @@ type GoodInfo struct {
 	Bbx01                       string               `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 	Bby01                       string               `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	Bck01b                      string               `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+	IsZeroFlag                  int64                `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 
 	ZuobiaoId string `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
 

models/his_charge_models.go

@@ -461,6 +461,7 @@ type NewDrug struct {
 	RetailPrice  float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	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"`
+	IsZeroFlag   int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (NewDrug) TableName() string {

models/his_models.go

@@ -360,6 +360,7 @@ type Drug struct {
 	Bck01b                      string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
 	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	Bbx01                       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
+	IsZeroFlag                  int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (Drug) TableName() string {
@@ -768,6 +769,7 @@ type VMDrug struct {
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	IsZeroFlag                  int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (VMDrug) TableName() string {

models/new_stock_models.go

@@ -138,6 +138,7 @@ type NewBaseDrug struct {
 	SumCount                    int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SumInCount                  int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	IsPharmacy                  int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
+	IsZeroFlag                  int64                  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (NewBaseDrug) TableName() string {
@@ -175,6 +176,7 @@ type NewBaseDrugOne struct {
 	DrugType               int64                  `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
 	MedicalInsuranceLevel  int64                  `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
 	IsSelfDrug             int64                  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	IsZeroFlag             int64                  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (NewBaseDrugOne) TableName() string {
@@ -454,6 +456,7 @@ type VmBaseDrugTwenty struct {
 	NewDrugFlowPofitWarehouseInfo    []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"new_drug_profit_flow_info"`
 	NewDrugFlowNoPofitWarehouseInfo  []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"new_drug_no_profit_flow_info"`
 	NewDrugFlowNoCancelWarehouseInfo []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"new_drug_cancel_flow_info"`
+	IsZeroFlag                       int64             `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (VmBaseDrugTwenty) TableName() string {

models/pharmacy_models.go

@@ -506,6 +506,7 @@ type BaseDrugLibL struct {
 	IsPharmacy            int64                  `gorm:"column:is_pharmacy" json:"is_pharmacy" form:"is_pharmacy"`
 	List1                 interface{}            `json:"list_1"`
 	List2                 interface{}            `json:"list_2"`
+	IsZeroFlag            int64                  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (BaseDrugLibL) TableName() string {

models/self_drug_models.go

@@ -83,6 +83,7 @@ type XtBaseDrug struct {
 	IsSelfDrug             int64   `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
 	SumCount               int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SpecificationName      string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	IsZeroFlag             int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (XtBaseDrug) TableName() string {

models/stock_models.go

@@ -853,7 +853,7 @@ type VmBaseDrug struct {
 	WareStartStockCancelInfo         []*DrugFlow               //期初结余退库
 	WareEndStockCancelInfo           []*DrugFlow               //期末结余退库
 	WareStartEndStockCancelInfo      []*DrugFlow               //期中减少退库
-
+	IsZeroFlag                       int64                     `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (VmBaseDrug) TableName() string {

models/supply.models.go

@@ -39,6 +39,7 @@ type SpBaseDrug struct {
 	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"`
+	IsZeroFlag             int64                  `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (SpBaseDrug) TableName() string {

service/his_service.go

@@ -2266,6 +2266,11 @@ func GetNewHisPatientInfo(his_patient_id int64) (info models.HisPatient, err err
 	err = readDb.Model(&models.HisPatient{}).Where("id = ? AND status = 1 ", his_patient_id).First(&info).Error
 	return
 }
+func GetLastNewHisPatientInfo(patient_id int64, recordDateTime int64) (info models.HisPatient, err error) {
+	err = readDb.Model(&models.HisPatient{}).Where("patient_id = ? AND status = 1  and record_date < ?", patient_id, recordDateTime).First(&info).Error
+	return
+
+}
 
 func GetNewHisOrder(user_org_id int64, mdtrt_id string, patient_id int64) (order models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND mdtrt_id=? ", user_org_id, patient_id, mdtrt_id).

service/stock_service.go

@@ -279,6 +279,7 @@ func ModifyGoodInfo(goodInfo *models.GoodInfo) (error, *models.GoodInfo) {
 		"zuobiao_id":                     goodInfo.Bbx01,
 		"first_letter":                   goodInfo.FirstLetter,
 		"is_show":                        goodInfo.IsShow,
+		"is_zero_flag":                   goodInfo.IsZeroFlag,
 	}).Error
 
 	writeDb.Model(&models.WarehousingInfo{}).Where("good_id = ? AND org_id = ?", goodInfo.ID, goodInfo.OrgId).Updates(map[string]interface{}{"good_type_id": goodInfo.GoodTypeId})
@@ -1180,6 +1181,7 @@ type Drug struct {
 	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsZeroFlag                  int64   `gorm:"column:is_zero_flag" json:"is_zero_flag" form:"is_zero_flag"`
 }
 
 func (Drug) TableName() string {