1111

controllers/his_api_controller.go

@@ -42,7 +42,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/refundnumber/post", &HisApiController{}, "get:RefundNumber")
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "get:RefundDetail")
 
-	beego.Router("/api/code/get", &HisApiController{}, "get:GetCode")
+	//beego.Router("/api/code/get", &HisApiController{}, "get:GetCode")
 
 	beego.Router("/api/treatment/check", &HisApiController{}, "get:CheckTreatment")
 
@@ -1993,7 +1993,7 @@ func (c *HisApiController) GetCode() {
 		user_name = role.UserName
 	}
 
-	baseParams := models.BaseParams{
+	baseParams := &models.BaseParams{
 		SecretKey:      miConfig.SecretKey,
 		FixmedinsCode:  miConfig.Code,
 		InsuplcAdmdvs:  miConfig.InsuplcAdmdvs,

models/his_models.go

@@ -167,56 +167,57 @@ func (HisCaseHistoryTemplate) TableName() string {
 }
 
 type HisDoctorAdviceInfo 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"`
-	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	HisPatientId          int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
-	AdviceType            int64   `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
-	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
-	StartTime             int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
-	AdviceDesc            string  `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
-	ReminderDate          int64   `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
-	SingleDose            float64 `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
-	SingleDoseUnit        string  `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
-	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
-	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-	DeliveryWay           string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
-	ExecutionFrequency    string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
-	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
-	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"`
-	AdviceAffirm          string  `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
-	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
-	StopTime              int64   `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
-	StopReason            string  `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
-	StopDoctor            int64   `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
-	StopState             int64   `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
-	ParentId              int64   `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
-	ExecutionTime         int64   `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
-	ExecutionStaff        int64   `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
-	ExecutionState        int64   `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
-	Checker               int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	DialysisOrderId       int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
-	CheckTime             int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
-	CheckState            int64   `gorm:"column:check_state" json:"check_state" form:"check_state"`
-	DrugSpec              float64 `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugSpecUnit          string  `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
-	Groupno               int64   `gorm:"column:groupno" json:"groupno" form:"groupno"`
-	RemindType            int64   `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
-	FrequencyType         int64   `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
-	DayCount              int64   `gorm:"column:day_count" json:"day_count" form:"day_count"`
-	WeekDay               string  `gorm:"column:week_day" json:"week_day" form:"week_day"`
-	TemplateId            string  `gorm:"column:template_id" json:"template_id" form:"template_id"`
-	Modifier              int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
-	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
-	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
-	FeedetlSn             string  `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
-	Day                   int64   `gorm:"column:day" json:"day" form:"day"`
+	ID                    int64       `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64       `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId             int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64       `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	AdviceType            int64       `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64       `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64       `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string      `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string      `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64       `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string      `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64     `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string      `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string      `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string      `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64       `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	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"`
+	AdviceAffirm          string      `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string      `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64       `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string      `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64       `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64       `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64       `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64       `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64       `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64       `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64       `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64       `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64       `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64       `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64       `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64     `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string      `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64       `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64       `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64       `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64       `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string      `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string      `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64       `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64     `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64       `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string      `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string      `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64       `gorm:"column:day" json:"day" form:"day"`
+	BaseDrugLib           BaseDrugLib `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

service/gdyb_service.go

@@ -370,7 +370,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
-						MedListCodg:      subItem.MedListCodg,
+						MedListCodg:      subItem.BaseDrugLib.MedicalInsuranceNumber,
 					}
 
 					customs = append(customs, cus)
@@ -389,7 +389,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-						MedListCodg:      subItem.MedListCodg,
+						MedListCodg:      subItem.HisProject.MedicalCode,
 					}
 					customs = append(customs, cus)
 				}
@@ -1047,7 +1047,7 @@ func Gdyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	return str
 }
 
-func Gdyb3301(baseParams models.BaseParams, name string, codg string) string {
+func Gdyb3301(baseParams *models.BaseParams, name string, codg string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -1058,13 +1058,25 @@ func Gdyb3301(baseParams models.BaseParams, name string, codg string) string {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3301" // 交易编码
+
 	inputData["fixmedins_hilist_id"] = baseParams.FixmedinsCode
+
 	inputData["fixmedins_hilist_name"] = name
 	inputData["list_type"] = "西药"
 	inputData["med_list_codg"] = codg
 	inputData["begndate"] = "2021-01-01"
 	inputData["enddate"] = "2021-01-07"
-	input["data"] = inputData
+
+	inputData["aprvno"] = ""
+	inputData["dosform"] = ""
+	inputData["exct_cont"] = ""
+	inputData["item_cont"] = ""
+	inputData["prcunt"] = ""
+	inputData["spec"] = ""
+	inputData["pacspec"] = ""
+	inputData["memo"] = ""
+
+	input["catalogcompin"] = inputData
 	inputMessage["input"] = input //交易输入
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))

service/his_service.go

@@ -196,8 +196,12 @@ func DelelteProject(id int64, user_org_id int64) (err error) {
 
 func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
-		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
-		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).