更新

controllers/sg/his_api_controller.go

@@ -14,7 +14,7 @@ import (
 	"fmt"
 	//"github.com/tjfoc/gmsm/sm2"
 	//"github.com/tjfoc/gmsm/sm3"
-
+	"github.com/go-ole/go-ole"
 	"gdyb/controllers"
 	"gdyb/enums"
 	"gdyb/models"
@@ -2525,10 +2525,11 @@ func (c *HisApiController) GetCFYLJG001() {
 			flow.OriginalRxFile = ""
 			flow.OriginalValue = ""
 			flow.SignCertDn = ""
+			flow.UserOrgId = 10454
 			flow.SignCertSn = ""
 			flow.Mtime = time.Now().Unix()
-			flow.ID = 0
-			service.Createflow(flow)
+
+			service.Createflow(&flow)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "上传成功",
 			})
@@ -2537,14 +2538,18 @@ func (c *HisApiController) GetCFYLJG001() {
 }
 func (c *HisApiController) GetCFYLJG002() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
-	id, _ := c.GetInt64("id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	record_time := c.GetString("record_time")
+	admin_user_id = 3626
+	his, _ := service.GetHisPatientRecord(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	//id, _ := c.GetInt64("id")
 	admin_user_id = 3626
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	flow, _ := service.Getflow(id)
-	his, _ := service.GetHisPatientByNumber(flow.MID)
-	record_time := c.GetString("record_time")
+
+	flow, _ := service.Getflowtwo(his.Number)
+	//his, _ := service.GetHisPatientByNumber(flow.MID)
+	//record_time := c.GetString("record_time")
 	patient_id, _ := c.GetInt64("patient_id")
 	//patient_id = 23834
 	//record_time = "2023-09-18"
@@ -2640,15 +2645,17 @@ func (c *HisApiController) GetCFYLJG002() {
 }
 func (c *HisApiController) GetCFYLJG003() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
-	id, _ := c.GetInt64("id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	record_time := c.GetString("record_time")
+	admin_user_id = 3626
+	his, _ := service.GetHisPatientRecord(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	//id, _ := c.GetInt64("id")
 	admin_user_id = 3626
-	//id  = 3
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	flow, _ := service.Getflow(id)
-	his, _ := service.GetHisPatientByNumber(flow.MID)
-	record_time := c.GetString("record_time")
+
+	flow, _ := service.Getflowtwo(his.Number)
+	//id  = 3
 	patient_id, _ := c.GetInt64("patient_id")
 	//patient_id = 23834
 	//record_time = "2023-09-18"
@@ -2728,15 +2735,17 @@ func (c *HisApiController) GetCFYLJG003() {
 }
 func (c *HisApiController) GetCFYLJG004() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
-
-	id, _ := c.GetInt64("id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	record_time := c.GetString("record_time")
+	admin_user_id = 3626
+	his, _ := service.GetHisPatientRecord(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	//id, _ := c.GetInt64("id")
 	admin_user_id = 3626
-	//id  = 3
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	flow, _ := service.Getflow(id)
-	//his, _ := service.GetHisPatientByNumber(flow.MID)
-	record_time := c.GetString("record_time")
+
+	flow, _ := service.Getflowtwo(his.Number)
+	//id  = 3
 	patient_id, _ := c.GetInt64("patient_id")
 	//patient_id = 23834
 	//record_time = "2023-09-18"
@@ -2793,19 +2802,26 @@ func (c *HisApiController) GetCFYLJG004() {
 }
 func (c *HisApiController) GetCFYLJG005() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	//record_time := c.GetString("record_time")
+	admin_user_id = 3626
+	his, _ := service.GetHisPatientRecord(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	//id, _ := c.GetInt64("id")
+	admin_user_id = 3626
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+
+	flow, _ := service.Getflowtwo(his.Number)
+	//id  = 3
 	var cFYLJG005 models.CFYLJG005
-	id, _ := c.GetInt64("id")
-	patient_id, _ := c.GetInt64("patient_id")
-	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
-	flow, _ := service.Getflow(id)
+
+	//patient_id, _ := c.GetInt64("patient_id")
 	cFYLJG005.HiRxno = flow.HiRxno
 	cFYLJG005.MdtrtID = flow.MID
 	cFYLJG005.EcToken = ""
-	cFYLJG005.PsnName = patient.Name
+	cFYLJG005.PsnName = his.Name
 	cFYLJG005.PsnCertType = "01"
-	cFYLJG005.Certno = patient.IdCardNo
+	cFYLJG005.Certno = his.IdCardNo
 	result, request := service.GetCFYLJG005(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG005)
 	saveLog(result, request, "GetCFYLJG005", "GetCFYLJG005")
 
@@ -2837,13 +2853,19 @@ func (c *HisApiController) GetCFYLJG005() {
 }
 func (c *HisApiController) GetCFYLJG006() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	admin_user_id = 3626
+	his, _ := service.GetHisPatientRecord(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	//id, _ := c.GetInt64("id")
+	admin_user_id = 3626
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	var cFYLJG006 models.CFYLJG006
-	id, _ := c.GetInt64("id")
+
+	flow, _ := service.Getflowtwo(his.Number)
+	//id  = 3
 	patient_id, _ := c.GetInt64("patient_id")
+	var cFYLJG006 models.CFYLJG006
 	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
-	flow, _ := service.Getflow(id)
 	cFYLJG006.HiRxno = flow.HiRxno
 	cFYLJG006.MdtrtID = flow.MID
 	cFYLJG006.PsnName = patient.Name
@@ -2851,19 +2873,48 @@ func (c *HisApiController) GetCFYLJG006() {
 	cFYLJG006.Certno = patient.IdCardNo
 	result, request := service.GetCFYLJG006(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG006)
 	saveLog(result, request, "GetCFYLJG006", "GetCFYLJG006")
-
+	var res ResultCFYLJG006
+	var respJSON2 map[string]interface{}
+	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	userJSONBytes2, _ := json.Marshal(respJSON2)
+	if err := json.Unmarshal(userJSONBytes2, &res); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if res.Infcode == -1 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         res.ErrMsg,
+		})
+		return
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"info": res.Output,
+		})
+		return
+	}
 }
 func (c *HisApiController) GetCFYLJG007() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	admin_user_id = 3626
+	his, _ := service.GetHisPatientRecord(c.GetAdminUserInfo().CurrentOrgId, his_patient_id)
+	//id, _ := c.GetInt64("id")
+	admin_user_id = 3626
 	curRoles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	var cFYLJG007 models.CFYLJG007
-	id, _ := c.GetInt64("id")
+
+	flow, _ := service.Getflowtwo(his.Number)
+	//id  = 3
 	patient_id, _ := c.GetInt64("patient_id")
+	var cFYLJG007 models.CFYLJG007
 	patient, _ := service.GetPatientByID(c.GetAdminUserInfo().CurrentOrgId, patient_id)
 	//his, _ := service.GetHisPatient(c.GetAdminUserInfo().CurrentOrgId,patient_id)
-	flow, _ := service.Getflow(id)
-	his, _ := service.GetHisPatientByNumber(flow.MID)
 
 	cFYLJG007.HiRxno = flow.HiRxno
 	cFYLJG007.MdtrtID = flow.MID
@@ -2874,7 +2925,7 @@ func (c *HisApiController) GetCFYLJG007() {
 	result, request := service.GetCFYLJG007(miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, cFYLJG007)
 	saveLog(result, request, "GetCFYLJG007", "GetCFYLJG007")
 
-	var res ResultCFYLJG006
+	var res ResultCFYLJG007
 	var respJSON2 map[string]interface{}
 	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
@@ -2895,7 +2946,7 @@ func (c *HisApiController) GetCFYLJG007() {
 		return
 	} else {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"info": res.Output,
+			"info": res,
 		})
 		return
 	}
@@ -4429,16 +4480,19 @@ func (c *HisApiController) ReadEleToken() {
 					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 					infoStr := string(Iinfos)
 					idetinfoStr := string(Idetinfos)
+				  //date,age,_  :=  GetBirthdateAndAge(res.Output.Baseinfo.Certno),
+						b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+
 					psn := &models.HisPsn{
 						PsnNo: res.Output.Baseinfo.PsnNo,
-
 						PatientId: patient.ID,
 						Certno:    res.Output.Baseinfo.Certno,
-
 						Gend:         res.Output.Baseinfo.Gend,
 						Naty:         res.Output.Baseinfo.Naty,
 						PsnCertType:  res.Output.Baseinfo.PsnCertType,
 						PsnName:      res.Output.Baseinfo.PsnName,
+						Age:float64(age),
+						Brdy:b,
 						Idetinfo:     idetinfoStr,
 						Insuinfo:     infoStr,
 						UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
@@ -7948,12 +8002,14 @@ func (c *HisApiController) ReadCard() {
 					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 					infoStr := string(Iinfos)
 					idetinfoStr := string(Idetinfos)
+					b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+
 					psn := &models.HisPsn{
 						PsnNo: res.Output.Baseinfo.PsnNo,
-
 						PatientId: patient.ID,
 						Certno:    res.Output.Baseinfo.Certno,
-
+						Brdy:        b,
+						Age:float64(age),
 						Gend:        res.Output.Baseinfo.Gend,
 						Naty:        res.Output.Baseinfo.Naty,
 						PsnCertType: res.Output.Baseinfo.PsnCertType,
@@ -8122,12 +8178,14 @@ func (c *HisApiController) ReadCard() {
 							Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 							infoStr := string(Iinfos)
 							idetinfoStr := string(Idetinfos)
+							b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+
 							psn := &models.HisPsn{
 								PsnNo: res.Output.Baseinfo.PsnNo,
-
 								PatientId: patient.ID,
 								Certno:    res.Output.Baseinfo.Certno,
-								//Brdy:         res.Output.Baseinfo.Brdy,
+								Brdy:         b,
+								Age:float64(age),
 								Gend:         res.Output.Baseinfo.Gend,
 								Naty:         res.Output.Baseinfo.Naty,
 								PsnCertType:  res.Output.Baseinfo.PsnCertType,
@@ -9958,11 +10016,14 @@ func (c *HisApiController) ReadCard() {
 						Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 						infoStr := string(Iinfos)
 						idetinfoStr := string(Idetinfos)
+						b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+
 						psn := &models.HisPsn{
 							PsnNo:     res.Output.Baseinfo.PsnNo,
 							PatientId: patient.ID,
 							Certno:    res.Output.Baseinfo.Certno,
-
+							Brdy:        b,
+							Age:float64(age),
 							//Brdy: res.Output.Baseinfo.Brdy,
 							Gend:         res.Output.Baseinfo.Gend,
 							Naty:         res.Output.Baseinfo.Naty,
@@ -11264,12 +11325,15 @@ func (c *HisApiController) ReadCard() {
 						Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 						infoStr := string(Iinfos)
 						idetinfoStr := string(Idetinfos)
+
+						b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
 						psn := &models.HisPsn{
 							PsnNo:     res.Output.Baseinfo.PsnNo,
 							PatientId: patient.ID,
 							Certno:    res.Output.Baseinfo.Certno,
 							Gend:      res.Output.Baseinfo.Gend,
-							//Brdy:         res.Output.Baseinfo.Brdy,
+							Brdy:        b,
+							Age:float64(age),
 							Naty:         res.Output.Baseinfo.Naty,
 							PsnCertType:  res.Output.Baseinfo.PsnCertType,
 							PsnName:      res.Output.Baseinfo.PsnName,
@@ -17109,6 +17173,12 @@ type ResultCFYLJG007 struct {
 	InfRefmsgid string `json:"inf_refmsgid"`
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
+		HiRxno           string        `json:"hi_rxno"`
+		RxStasName       string        `json:"rx_stas_name"`
+		RxUsedStasCodg   string        `json:"rx_used_stas_codg"`
+		Seltdelts        []interface{} `json:"seltdelts"`
+		RxUsedStasName   string        `json:"rx_used_stas_name"`
+		RxStasCodg       string        `json:"rx_stas_codg"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`
@@ -17241,7 +17311,7 @@ type ResultCFYLJG005 struct {
 			SinDosunt       string  `json:"sin_dosunt"`
 			UsedFrquCodg    string  `json:"used_frqu_codg"`
 			UsedFrquName    string  `json:"used_frqu_name"`
-			DrugTotlcnt     float64 `json:"drug_totlcnt"`
+			DrugTotlcnt     string `json:"drug_totlcnt"`
 			DrugTotlcntEmp  string  `json:"drug_totlcnt_emp"`
 			DiseCodg        string  `json:"dise_codg"`
 			HospApprFlag    string  `json:"hosp_appr_flag"`
@@ -21039,6 +21109,8 @@ func (c *HisApiController) GetUploadInfo() {
 							order.Creator = order.Creator
 							order.Modify = roles.AdminUserId
 							order.RequestLog = src_resquest
+						order.FaPiaoNumber =         fapiao_number
+							order.FaPiaoCode =           fapiao_code
 							//setlDetail, _ := json.Marshal(res.Output.Setldetail)
 							//detailStr := string(setlDetail)
 							//order.SetlDetail = detailStr
@@ -22117,6 +22189,8 @@ func (c *HisApiController) GetUploadInfo() {
 				order.Modify = roles.AdminUserId
 				order.RequestLog = src_resquest
 				order.Diagnosis = diagnosis_id
+				order.FaPiaoNumber =         fapiao_number
+				order.FaPiaoCode =           fapiao_code
 				setlDetail, _ := json.Marshal(res.Output.Setldetail)
 				detailStr := string(setlDetail)
 				order.SetlDetail = detailStr
@@ -33027,3 +33101,37 @@ func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
 	}
 	return
 }
+
+
+func getBirthdateAndAge(idNumber string) (string, int, error) {
+	if len(idNumber) != 18 {
+		return "", 0, fmt.Errorf("invalid ID number length. It should be 18 digits")
+	}
+
+	// 提取出生日期
+	year, err := strconv.Atoi(idNumber[6:10])
+	if err != nil {
+		return "", 0, err
+	}
+	month, err := strconv.Atoi(idNumber[10:12])
+	if err != nil {
+		return "", 0, err
+	}
+	day, err := strconv.Atoi(idNumber[12:14])
+	if err != nil {
+		return "", 0, err
+	}
+
+	// 格式化生日字符串
+	birthdate := time.Date(year, time.Month(month), day, 0, 0, 0, 0, time.UTC)
+	birthdateFormatted := birthdate.Format("2006-01-02")
+
+	// 计算年龄
+	today := time.Now()
+	age := today.Year() - birthdate.Year()
+	if today.YearDay() < birthdate.YearDay() {
+		age--
+	}
+
+	return birthdateFormatted, age, nil
+}

controllers/zh/zh_his_api_controller.go

@@ -3792,6 +3792,52 @@ func (c *ZHHisApiController) GetUploadInfo() {
 
 		var customs []*models.NewCustom
 
+		var empty_code_errs []string
+
+		for _, item := range prescriptions {
+			if item.Type == 1 { //药品
+				for _, subItem := range item.HisDoctorAdviceInfo {
+					if len(subItem.BaseDrugLib.MedicalInsuranceNumber) == 0 {
+
+						empty_code_errs = append(empty_code_errs,subItem.BaseDrugLib.DrugName)
+					}
+				}
+			}
+
+			if item.Type == 2 { //项目
+				for _, subItem := range item.HisPrescriptionProject {
+					//var randNum int
+					//randNum = rand.Intn(10000) + 1000
+					if subItem.Type == 2 {
+						if len(subItem.HisProject.MedicalCode) == 0 {
+							empty_code_errs = append(empty_code_errs,subItem.HisProject.ProjectName)
+
+						}
+					} else if subItem.Type == 3 {
+						if len(subItem.GoodInfo.MedicalInsuranceNumber) == 0 {
+							empty_code_errs = append(empty_code_errs,subItem.GoodInfo.GoodName)
+
+						}
+					}
+				}
+			}
+
+		}
+		if len(empty_code_errs) > 0{
+			var err string
+			for _, item := range empty_code_errs{
+				if len(err) == 0{
+					err = item
+				}else{
+					err = err +"," + item
+				}
+			}
+			c.ServeSuccessJSON(map[string]interface{}{
+				"failed_code": -10,
+				"msg":     err +" "+ "没有填写国家编码",
+			})
+			return
+		}
 		for _, item := range prescriptions {
 			tm := time.Unix(item.PreTime, 0)
 			if item.Type == 1 { //药品

main.go

@@ -49,7 +49,7 @@ func main() {
 
 	//深圳百霖
 	//GetblBatchSettleList()
-	//GetblbrBatchSettleList()
+	//GetblbrBatchSettleList()8
 	//深圳百霖贝尔
 	//GetbrBatchSettleList()
 

models/cfyljg.go

@@ -243,7 +243,7 @@ type HisPrescriptionFlow struct {
 	SignCertSn     string `gorm:"column:sign_cert_sn" json:"sign_cert_sn" form:"sign_cert_sn"`
 	SignCertDn     string `gorm:"column:sign_cert_dn" json:"sign_cert_dn" form:"sign_cert_dn"`
 	MID            string `gorm:"column:m_id" json:"m_id" form:"m_id"`
-	DCode            string `gorm:"column:m_id" json:"m_id" form:"m_id"`
+	DCode            string `gorm:"column:d_code" json:"d_code" form:"d_code"`
 	DID           int64 `gorm:"column:d_id" json:"d_id" form:"d_id"`
 
 

service/dianzichufang.go

@@ -745,3 +745,9 @@ func Getflow(id int64) (flow models.HisPrescriptionFlow, err error) {
 	err = readDb.Model(&models.HisPrescriptionFlow{}).Where("id = ?", id).First(&flow).Error
 	return
 }
+
+
+func Getflowtwo(m_id string) (flow models.HisPrescriptionFlow, err error) {
+	err = readDb.Model(&models.HisPrescriptionFlow{}).Where("m_id = ?", m_id).First(&flow).Error
+	return
+}

service/gdyb_service.go

@@ -626,6 +626,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 
 	for index, item := range config {
 		diseinfo_sun := make(map[string]interface{})
+
 		diseinfo_sun["diag_type"] = "1"              // 诊断类别
 		diseinfo_sun["diag_srt_no"] = index + 1          // 诊断排序号
 		diseinfo_sun["diag_code"] = item.CountryCode // 诊断代码

service/hbyb_service.go

@@ -2876,7 +2876,7 @@ func Hb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, c
 	fmt.Println("----------")
 	fmt.Println(string(bytesData))
 	fmt.Println("----------")
-	requestLog := string(bytesData)
+	//requestLog := string(bytesData)
 
 	if err != nil {
 		fmt.Println(err.Error())
@@ -2913,7 +2913,7 @@ func Hb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, c
 		fmt.Println(err.Error())
 		return "", ""
 	}
-	return string(respBytes), requestLog
+	return   ConvertToString(string(respBytes), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 
 }
 func Hb2301A(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, opertor string) (string, string) {
@@ -3103,7 +3103,7 @@ func Hb2303(psnNo string, mdtrtId string, chrgBchno string, certNo string, insut
 		fmt.Println("error:", err.Error())
 	}
 
-	return string(out), string(bytesData)
+	return ConvertToString(string(out), "gbk", "utf-8"), ConvertToString(string(bytesData), "gbk", "utf-8")
 }
 //  住院结算
 func Hb2304(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, mid_setl_flag string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, fapiao_number string, acct_used_flag string) (string, string) {

service/his_service.go

@@ -1665,7 +1665,7 @@ func Saveflow(flow models.HisPrescriptionFlow) {
 	writeDb.Save(&flow)
 }
 
-func Createflow(flow models.HisPrescriptionFlow) {
+func Createflow(flow *models.HisPrescriptionFlow) {
 	writeDb.Create(&flow)
 }
 

service/hn_service.go

@@ -1633,7 +1633,7 @@ func Hnyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	inputData["opsp_mdtrt_date"] = ""                         // 门诊慢特病就诊日期  必填
 	inputData["ipt_med_type"] = struct4101.IptMedType         // 住院医疗类型  必填
 	inputData["adm_way"] = ""                                 // 入院途径  必填
-	inputData["trt_type"] = ""                                // 治疗类别  必填
+	inputData["trt_type"] = "10"                                // 治疗类别  必填
 	inputData["adm_time"] = struct4101.AdmTime                // 入院时间  必填
 	inputData["adm_caty"] = struct4101.AdmCaty                // 入院科别  必填
 	inputData["refldept_dept"] = ""                           // 转科科别  必填

service/jsyb_service.go

@@ -1040,11 +1040,11 @@ func SetJSInputMessage(timestamp int64, org_name string, doctor string, fixmedin
 	inputMessage["infver"] = "1.0.0"                                                            // 接收方系统代码
 	inputMessage["opter_type"] = "1"                                                            // 经办人类别
 	if fixmedins_code == "H32090403023" {
-		inputMessage["opter"] = doctor      // 经办人
-		inputMessage["opter_name"] = doctor // 经办人姓名
+		inputMessage["opter"] = "葛美琴"      // 经办人
+		inputMessage["opter_name"] = "葛美琴" // 经办人姓名
 	} else {
-		inputMessage["opter"] = doctor      // 经办人
-		inputMessage["opter_name"] = doctor // 经办人姓名
+		inputMessage["opter"] = "孙欣欣"      // 经办人
+		inputMessage["opter_name"] = "孙欣欣" // 经办人姓名
 	}
 	inputMessage["inf_time"] = timeFormatOne        // 交易时间
 	inputMessage["fixmedins_code"] = fixmedins_code // 定点医药机构编号