1111

controllers/gdyb_controller.go

@@ -146,13 +146,15 @@ func (c *GdybController) PostFour() {
 	med_type := c.GetString("med_type")
 	doctor_id, _ := c.GetInt64("doctor_id", 0)
 	fixmedins_code := c.GetString("fixmedins_code")
-
 	diag_code := c.GetString("diag_code")
+	sick_code := c.GetString("sick_code")
+	sick_name := c.GetString("sick_name")
+
 	insuplc_admdvs := c.GetString("insuplc_admdvs")
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 	secret_key := c.GetString("secret_key")
 
-	result := service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key)
+	result := service.Gdyb2203(psnNo, mdtrtId, doctor, department, diag, org_name, med_type, doctor_id, fixmedins_code, diag_code, insuplc_admdvs, mdtrtarea_admvs, secret_key, sick_code, sick_name)
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/his_api_controller.go

@@ -545,6 +545,8 @@ func (c *HisApiController) GetRegisterInfo() {
 				his.Mtime = time.Now().Unix()
 				diagnosisConfig, _ := service.FindDiagnoseById(patientPrescription.Diagnosis)
 
+				sickConfig, _ := service.FindSickById(patientPrescription.SickType)
+
 				api2 := "http://127.0.0.1:9532/" + "gdyb/four?psn_no=" + his.PsnNo +
 					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
 					"&diag=" + diagnosisConfig.ClassName + "&org_name=" + miConfig.OrgName + "&med_type=" + strconv.FormatInt(patientPrescription.RegisterType, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +

service/gdyb_service.go

@@ -212,7 +212,7 @@ func Gdyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string,
 }
 
 // 门诊就诊信息上传
-func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, diag string, org_name string, med_type string, doctor_id int64, fixmedins_code string, diag_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -232,8 +232,8 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
 	inputData["begntime"] = timeFormatOne // 开始时间
 	inputData["main_cond_dscr"] = ""      // 主要病情描述
-	inputData["dise_codg"] = ""           // 病种编码
-	inputData["dise_name"] = ""           // 病种名称
+	inputData["dise_codg"] = sick_code    // 病种编码
+	inputData["dise_name"] = sick_name    // 病种名称
 	inputData["birctrl_type"] = ""        // 计划生育手术类别
 	inputData["birctrl_matn_date"] = ""   // 计划生育手术或生育日期
 

service/his_service.go

@@ -796,6 +796,12 @@ func FindDiagnoseById(id int64) (*models.HisXtDiagnoseConfig, error) {
 	return dealer, err
 }
 
+func FindSickById(id int64) (*models.OutpatientServiceSick, error) {
+	outPatient := &models.OutpatientServiceSick{}
+	err := readDb.Model(&models.OutpatientServiceSick{}).Where("id = ? AND status = 1", id).First(&outPatient).Error
+	return outPatient, err
+}
+
 //
 //type MonthHisPrescription struct {
 //	ID                     int64                            `gorm:"column:id" json:"id" form:"id"`