提交代码

controllers/pharmacy_controller.go

@@ -47,6 +47,9 @@ func PharmacyApiRegistRouters() {
 	beego.Router("/api/pharmacy/updatedruginventorywarehouseinfo", &PharmacyController{}, "Get:UpdateDrugInventoryWarehouseInfo")
 
 	beego.Router("/api/pharmacy/changedrugcode", &PharmacyController{}, "Get:ChangeDrugCode")
+
+	beego.Router("/api/pharmacy/changeZeroFlag", &PharmacyController{}, "Get:ChangeZeroFlag")
+
 }
 
 // 测试
@@ -1423,3 +1426,16 @@ func (this *PharmacyController) ChangeDrugCode() {
 		"msg": "msg",
 	})
 }
+
+func (this *PharmacyController) ChangeZeroFlag() {
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	zero_flag, _ := this.GetInt64("zero_flag")
+	fmt.Println(id)
+	fmt.Println(zero_flag)
+	service.ChangeAdivceZeroFlag(id, zero_flag, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "msg",
+	})
+
+}

controllers/role_controller.go

@@ -239,6 +239,8 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	_, _, GongjuPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/hisTool")
 	_, _, ShoufeiPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/hospitalCharges")
 
+	_, _, FapiaoPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/eleFaPiao")
+
 	_, _, outpatientRegistrationPurview := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientRegistration/index")
 
 	_, _, outpatientRegistrationPurviewTwo := service.GetOtherAllGeneralPurviewVMsProcessed("/outpatientDoctorStation")
@@ -283,6 +285,7 @@ func (this *RoleAPIController) EditPurviewInitData() {
 	subPurviewTreeViewModelFive := []*service.PurviewTreeViewModel{}
 	subGongJuPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
 	subShouFeiPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
+	subFaPiaoPurviewTreeViewModel := []*service.PurviewTreeViewModel{}
 
 	for _, item := range YajinPurview {
 		temp := &service.PurviewTreeViewModel{
@@ -324,6 +327,16 @@ func (this *RoleAPIController) EditPurviewInitData() {
 		subGongJuPurviewTreeViewModel = append(subGongJuPurviewTreeViewModel, temp)
 	}
 
+	for _, item := range FapiaoPurview {
+		temp := &service.PurviewTreeViewModel{
+			ID:     item.Id,
+			PID:    item.Parentid,
+			Name:   item.Name,
+			Number: 1,
+		}
+		subFaPiaoPurviewTreeViewModel = append(subFaPiaoPurviewTreeViewModel, temp)
+	}
+
 	for _, item := range ShoufeiPurview {
 		temp := &service.PurviewTreeViewModel{
 			ID:     item.Id,
@@ -439,6 +452,11 @@ func (this *RoleAPIController) EditPurviewInitData() {
 
 			item.Childs = append(item.Childs, subGongJuPurviewTreeViewModel...)
 		}
+
+		if item.Name == "电子发票" {
+
+			item.Childs = append(item.Childs, subFaPiaoPurviewTreeViewModel...)
+		}
 	}
 
 	//电子病历

controllers/statistics_api_controller.go

@@ -2167,6 +2167,7 @@ func (c *StatisticsApiController) GetAllInspectionStatistisc() {
 	}
 
 }
+
 func (c *StatisticsApiController) GetPersonInspectionStatistisc() {
 	start_date := c.GetString("start_time")
 	end_date := c.GetString("end_time")
@@ -2236,6 +2237,7 @@ func (c *StatisticsApiController) GetPersonInspectionStatistisc() {
 	}
 
 }
+
 func (c *StatisticsApiController) GetStatistics() {
 	adminUserInfo := c.GetAdminUserInfo()
 

models/his_models.go

@@ -277,6 +277,7 @@ type HisDoctorAdviceInfo struct {
 	DrugCode              string                 `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 	IsUpload              int64                  `gorm:"column:is_upload" json:"is_upload" form:"is_upload"`
 	Patient               Patients               `gorm:"ForeignKey:ID;AssociationForeignKey:PatientId" json:"patient"`
+	ZeroFlag              int64                  `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

models/pharmacy_models.go

@@ -62,6 +62,7 @@ type PharmacyContent struct {
 	ExecutionState int64
 	Price          float64
 	DrugCode       string
+	ZeroFlag       string
 }
 
 // 发药明细列表
@@ -209,6 +210,7 @@ type HisDoctorAdviceInfoL struct {
 	People                int64   `gorm:"column:people" json:"people" form:"people"`
 	DispensingTime        int64   `gorm:"column:dispensing_time" json:"dispensing_time" form:"dispensing_time"`
 	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+	ZeroFlag              int64   `gorm:"column:zero_flag" json:"zero_flag" form:"zero_flag"`
 }
 
 func (HisDoctorAdviceInfoL) TableName() string {

service/pharmacy_service.go

@@ -321,6 +321,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				DrugId:       v.DrugId,
 				Price:        v.Price,
 				DrugCode:     v.DrugCode,
+				ZeroFlag:     config.ToString(v.ZeroFlag),
 			})
 		}
 
@@ -391,6 +392,7 @@ func GetPatientMedication(orgid, patient_id, stime, etime, is_medicine int64) (p
 				ExecutionTime:  v.ExecutionTime,
 				Price:          v.Price,
 				DrugCode:       v.DrugCode,
+				ZeroFlag:       config.ToString(v.ZeroFlag),
 			})
 		}
 
@@ -2466,6 +2468,12 @@ func ChangeAdivceDrugCode(id int64, drug_code string, user_org_id int64) (models
 	return adviceInfo, err
 }
 
+func ChangeAdivceZeroFlag(id int64, zero_flag int64, user_org_id int64) (models.HisDoctorAdviceInfo, error) {
+	adviceInfo := models.HisDoctorAdviceInfo{}
+	err := XTWriteDB().Model(&adviceInfo).Where("id = ? and user_org_id = ? and status =1", id, user_org_id).Updates(map[string]interface{}{"zero_flag": zero_flag}).Error
+	return adviceInfo, err
+}
+
 func DispensingMedicineTwo(orgid, patient_id, advice_date, drug_id, creater int64) (err error) {
 
 	//开事务