Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/gdyb_controller.go

@@ -19,7 +19,7 @@ func GdybRegistRouters() {
 	beego.Router("/gdyb/one", &GdybController{}, "get:PostOne")
 	beego.Router("/gdyb/two", &GdybController{}, "get:PostTwo")
 	beego.Router("/gdyb/three", &GdybController{}, "get:PostThree")
-	beego.Router("/gdyb/four", &GdybController{}, "get:PostFour")
+	//beego.Router("/gdyb/four", &GdybController{}, "get:PostFour")
 	beego.Router("/gdyb/five", &GdybController{}, "post:PostFive")
 	beego.Router("/gdyb/six", &GdybController{}, "get:PostSix")
 	//beego.Router("/gdyb/seven", &GdybController{}, "get:PostSeven")
@@ -146,41 +146,41 @@ func (c *GdybController) PostThree() {
 	})
 }
 
-func (c *GdybController) PostFour() {
-	psnNo := c.GetString("psn_no")
-	mdtrtId := c.GetString("mdtrt_id")
-	doctor := c.GetString("doctor")
-	department := c.GetString("department")
-	diag := c.GetString("diag")
-	org_name := c.GetString("org_name")
-	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")
-	dept := c.GetString("dept")
-
-	insuplc_admdvs := c.GetString("insuplc_admdvs")
-	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
-	secret_key := c.GetString("secret_key")
-
-	var result string
-	if insuplc_admdvs == "440781" { //
-		result = service.Gdyb2203A(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, dept)
-	} else {
-		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, dept)
-	}
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-
-	} else {
-
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"pre": dat,
-	})
-}
+//func (c *GdybController) PostFour() {
+//	psnNo := c.GetString("psn_no")
+//	mdtrtId := c.GetString("mdtrt_id")
+//	doctor := c.GetString("doctor")
+//	department := c.GetString("department")
+//	diag := c.GetString("diag")
+//	org_name := c.GetString("org_name")
+//	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")
+//	dept := c.GetString("dept")
+//
+//	insuplc_admdvs := c.GetString("insuplc_admdvs")
+//	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+//	secret_key := c.GetString("secret_key")
+//
+//	var result string
+//	if insuplc_admdvs == "440781" { //
+//		result = service.Gdyb2203A(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, dept)
+//	} else {
+//		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, dept)
+//	}
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//
+//	} else {
+//
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"pre": dat,
+//	})
+//}
 
 type All struct {
 	HisPrescription HisPrescription

controllers/sg/his_api_controller.go

@@ -337,17 +337,28 @@ func (c *HisApiController) GetSettleList() {
 	struct4101.CustomStruct = tempFunPays
 
 	var tempOpspdiseinfos []service.OpspdiseinfoStruct
-	var tempOpspdiseinfo service.OpspdiseinfoStruct
 	var tempOpspdiseinfo2 service.OpspdiseinfoStruct
-	sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
-	sickConfigTwo, _ := service.FindSickById(his.SickType)
-	tempOpspdiseinfo.DiagCode = sickConfig.CountryCode
-	tempOpspdiseinfo.DiagName = sickConfig.CountryContentName
-	tempOpspdiseinfo.MaindiagFlag = "1"
-	tempOpspdiseinfo.OprnOprtCode = ""
-	tempOpspdiseinfo.OprnOprtName = ""
+	//sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
+
+	diagnosis_ids := strings.Split(his.Diagnosis, ",")
+	var config []*models.HisXtDiagnoseConfig
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		config = append(config, diagnosisConfig)
+	}
 
-	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
+	for _, item := range config {
+		var tempOpspdiseinfo service.OpspdiseinfoStruct
+		tempOpspdiseinfo.DiagCode = item.CountryCode
+		tempOpspdiseinfo.DiagName = item.CountryContentName
+		tempOpspdiseinfo.MaindiagFlag = "1"
+		tempOpspdiseinfo.OprnOprtCode = ""
+		tempOpspdiseinfo.OprnOprtName = ""
+		tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
+	}
+
+	sickConfigTwo, _ := service.FindSickById(his.SickType)
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.CountryCode
 	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName
 	tempOpspdiseinfo2.MaindiagFlag = "2"
@@ -1810,7 +1821,7 @@ func (c *HisApiController) GetUploadInfo() {
 	fapiao_code := c.GetString("fapiao_code")
 	fapiao_number := c.GetString("fapiao_number")
 
-	diagnosis_id, _ := c.GetInt64("diagnosis")
+	diagnosis_id := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
 
@@ -1865,33 +1876,31 @@ func (c *HisApiController) GetUploadInfo() {
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
-	diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
-	sickConfig, _ := service.FindSickById(sick_type)
+	diagnosis_ids := strings.Split(diagnosis_id, ",")
 
+	var config []*models.HisXtDiagnoseConfig
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		config = append(config, diagnosisConfig)
+	}
+
+	sickConfig, _ := service.FindSickById(sick_type)
 	if tempOrder.ID == 0 {
+		var result string
+		if miConfig.InsuplcAdmdvs == "440781" { //
+			result = service.Gdyb2203A(his.PsnNo, his.Number, patientPrescription.Doctor, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), patientPrescription.DoctorId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+		} else {
+			result = service.Gdyb2203(his.PsnNo, his.Number, patientPrescription.Doctor, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), patientPrescription.DoctorId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
 
-		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(reg_type, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
-			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName + "&dept=" + roles.UserName
-		resp2, requestErr2 := http.Get(api2)
-		if requestErr2 != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
-		body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-		if ioErr2 != nil {
-			utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
 		}
+
 		var respJSON2 map[string]interface{}
-		if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
+		if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		respJSON2 = respJSON2["data"].(map[string]interface{})["pre"].(map[string]interface{})
 		userJSONBytes2, _ := json.Marshal(respJSON2)
 
 		var res2 ResultSix
@@ -1920,7 +1929,7 @@ func (c *HisApiController) GetUploadInfo() {
 			return
 
 		} else {
-			his.Diagnosis = diagnosisConfig.ID
+			his.Diagnosis = diagnosis_id
 			his.SickType = sickConfig.ID
 			his.PType = fmt.Sprintf("%d", reg_type)
 			service.UpdateHisPatientThree(&his)
@@ -2047,6 +2056,7 @@ func (c *HisApiController) GetUploadInfo() {
 						FaPiaoNumber:          fapiao_number,
 						FaPiaoCode:            fapiao_code,
 						PType:                 2,
+						Diagnosis:             diagnosis_id,
 					}
 					err = service.CreateOrder(order)
 					if err != nil {
@@ -2456,6 +2466,7 @@ func (c *HisApiController) GetUploadInfo() {
 				order.Creator = order.Creator
 				order.Modify = roles.AdminUserId
 				order.RequestLog = src_resquest
+				order.Diagnosis = diagnosis_id
 				setlDetail, _ := json.Marshal(res.Output.Setldetail)
 				detailStr := string(setlDetail)
 				order.SetlDetail = detailStr
@@ -3010,7 +3021,7 @@ func (c *HisApiController) GetPreUploadInfo() {
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
-	diagnosis_id, _ := c.GetInt64("diagnosis")
+	diagnosis_id := c.GetString("diagnosis")
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
 
@@ -3024,7 +3035,16 @@ func (c *HisApiController) GetPreUploadInfo() {
 	recordDateTime := theTime.Unix()
 	adminUser := c.GetAdminUserInfo()
 
-	diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
+	diagnosis_ids := strings.Split(diagnosis_id, ",")
+
+	var config []*models.HisXtDiagnoseConfig
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		config = append(config, diagnosisConfig)
+	}
+	//diagnosisConfig, _ := service.FindDiagnoseById(diagnosis_id)
+
 	sickConfig, _ := service.FindSickById(sick_type)
 
 	var prescriptions []*models.HisPrescription
@@ -3045,28 +3065,20 @@ func (c *HisApiController) GetPreUploadInfo() {
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 	strconv.FormatInt(his.PatientId, 10)
 
-	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(reg_type, 10) + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code + "&diag_code=" + diagnosisConfig.CountryCode +
-		"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&sick_code=" + sickConfig.CountryCode + "&sick_name=" + sickConfig.ClassName + "&dept=" + roles.UserName
-	resp2, requestErr2 := http.Get(api2)
-	if requestErr2 != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	body2, ioErr2 := ioutil.ReadAll(resp2.Body)
-	if ioErr2 != nil {
-		utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+	var result string
+	if miConfig.InsuplcAdmdvs == "440781" { //
+		result = service.Gdyb2203A(his.PsnNo, his.Number, patientPrescription.Doctor, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), patientPrescription.DoctorId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+	} else {
+		result = service.Gdyb2203(his.PsnNo, his.Number, patientPrescription.Doctor, department.Name, miConfig.OrgName, strconv.FormatInt(reg_type, 10), patientPrescription.DoctorId, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, sickConfig.CountryCode, sickConfig.ClassName, roles.UserName, config)
+
 	}
+
 	var respJSON2 map[string]interface{}
-	if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
+	if err := json.Unmarshal([]byte(string(result)), &respJSON2); err != nil {
 		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	respJSON2 = respJSON2["data"].(map[string]interface{})["pre"].(map[string]interface{})
 	userJSONBytes2, _ := json.Marshal(respJSON2)
 
 	var res2 ResultSix
@@ -3095,6 +3107,10 @@ func (c *HisApiController) GetPreUploadInfo() {
 		return
 
 	} else {
+		his.Diagnosis = diagnosis_id
+		his.SickType = sickConfig.ID
+		his.PType = fmt.Sprintf("%d", reg_type)
+		service.UpdateHisPatientThree(&his)
 
 		data := make(map[string]interface{})
 		if settle_accounts_type == 1 { //日结
@@ -3199,7 +3215,9 @@ func (c *HisApiController) GetPreUploadInfo() {
 					Creator:             roles.AdminUserId,
 					Modify:              roles.AdminUserId,
 					PType:               2,
+					Diagnosis:           diagnosis_id,
 				}
+
 				err = service.CreateOrder(order)
 				if err != nil {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreatePreOrderException)
@@ -4384,7 +4402,22 @@ func (c *HisApiController) GetSettleAccounts() {
 	orderInfos, _ := service.GetHisOrderInfoByNumber(order.Number)
 	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
 	orderInfos = append(orderInfos, orderInfos_two...)
-	diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
+	//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)
+
+	diagnosis_ids := strings.Split(his.Diagnosis, ",")
+
+	//var config []*models.HisXtDiagnoseConfig
+	var name string
+	for _, item := range diagnosis_ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		diagnosisConfig, _ := service.FindDiagnoseById(id)
+		if len(name) == 0 {
+			name = diagnosisConfig.ClassName
+
+		} else {
+			name = name + "," + diagnosisConfig.ClassName
+		}
+	}
 
 	var bedCostTotal float64 = 0         //床位总费
 	var bedCostSelfTotal float64 = 0     //床位自费
@@ -4528,7 +4561,7 @@ func (c *HisApiController) GetSettleAccounts() {
 
 		if res.Infcode == 0 {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"diagnosis":                                   diagnosisConfig.CountryContentName,
+				"diagnosis":                                   name,
 				"order_infos":                                 orderInfos,
 				"number":                                      order.MdtrtId,
 				"date":                                        order.SettleAccountsDate,

models/his_models.go

@@ -119,7 +119,7 @@ type HisPatient struct {
 	SocialType             int64   `gorm:"column:social_type" json:"social_type" form:"social_type"`
 	IdCardType             int64   `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
 	PType                  string  `gorm:"column:p_type" json:"p_type" form:"p_type"`
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
@@ -587,6 +587,7 @@ type XtHisPatient struct {
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (XtHisPatient) TableName() string {
@@ -694,6 +695,8 @@ type HisOrder struct {
 
 	PType int64 `gorm:"column:p_type" json:"p_type" form:"p_type"`
 	IsPre int64 `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+
+	Diagnosis string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 }
 
 func (HisOrder) TableName() string {
@@ -789,7 +792,7 @@ type VMHisPatient struct {
 	YiliaoNumber           string  `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
 	MzNumber               string  `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
-	Diagnosis              int64   `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Diagnosis              string  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PType                  int64   `gorm:"column:p_type" json:"p_type" form:"p_type"`
 }

service/gdyb_service.go

@@ -234,17 +234,17 @@ func Gdyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
-	//tempTime := time.Unix(timestamp, 0)
-	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
-	inputMessage["infno"] = "2201"                // 交易编码
-	inputData["psn_no"] = psnNo                   // 人员编号 （来自1101接口返回）
-	inputData["insutype"] = insutype              // 险种类型（来自1101接口返回）
-	inputData["begntime"] = "2021-04-10 12:20:30" // 开始时间
+	inputMessage["infno"] = "2201"        // 交易编码
+	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
+	inputData["insutype"] = insutype      // 险种类型（来自1101接口返回）
+	inputData["begntime"] = timeFormatOne // 开始时间
 
 	//if id_card_type == 1 {
 	//	inputData["mdtrt_cert_type"] = "03" // 就诊凭证类型
@@ -371,13 +371,13 @@ 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, sick_code string, sick_name string, dept string) string {
+func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id int64, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
-	//tempTime := time.Unix(timestamp, 0)
-	//timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
+	tempTime := time.Unix(timestamp, 0)
+	timeFormatOne := tempTime.Format("2006-01-02 15:04:05")
 
 	// 生成输入报文
 	inputMessage := SetInputMessage(nonce, timestamp, org_name, dept, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
@@ -385,31 +385,32 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 	inputData := make(map[string]interface{})
 	diseinfo := make([]map[string]interface{}, 0)
 
-	inputMessage["infno"] = "2203"   // 交易编码
-	inputData["mdtrt_id"] = mdtrtId  // 就诊 ID（来自2201接口返回）
-	inputData["psn_no"] = psnNo      // 人员编号 （来自1101接口返回）
-	inputData["med_type"] = med_type // 医疗类别 16门诊特殊病
-	//inputData["begntime"] = timeFormatOne // 开始时间
-	inputData["begntime"] = "2021-04-10 12:20:30" // 开始时间
-	inputData["main_cond_dscr"] = ""              // 主要病情描述
-	inputData["dise_codg"] = sick_code            // 病种编码
-	inputData["dise_name"] = sick_name            // 病种名称
-	inputData["birctrl_type"] = ""                // 计划生育手术类别
-	inputData["birctrl_matn_date"] = ""           // 计划生育手术或生育日期
-
-	diseinfo_sun := make(map[string]interface{})
-	diseinfo_sun["diag_type"] = "1"         // 诊断类别
-	diseinfo_sun["diag_srt_no"] = "1"       // 诊断排序号
-	diseinfo_sun["diag_code"] = diag_code   // 诊断代码
-	diseinfo_sun["diag_name"] = diag        // 诊断名称
-	diseinfo_sun["diag_dept"] = department  // 诊断科室
-	diseinfo_sun["dise_dor_no"] = doctor_id // 诊断医生编码
-	diseinfo_sun["dise_dor_name"] = doctor  // 诊断医生姓名
-	//diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
-	diseinfo_sun["diag_time"] = "2021-04-10 12:20:30"
-	diseinfo_sun["vali_flag"] = "1" // 有效标志
-
-	diseinfo = append(diseinfo, diseinfo_sun)
+	inputMessage["infno"] = "2203"        // 交易编码
+	inputData["mdtrt_id"] = mdtrtId       // 就诊 ID（来自2201接口返回）
+	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
+	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
+	inputData["begntime"] = timeFormatOne // 开始时间
+	//inputData["begntime"] =  // 开始时间
+	inputData["main_cond_dscr"] = ""    // 主要病情描述
+	inputData["dise_codg"] = sick_code  // 病种编码
+	inputData["dise_name"] = sick_name  // 病种名称
+	inputData["birctrl_type"] = ""      // 计划生育手术类别
+	inputData["birctrl_matn_date"] = "" // 计划生育手术或生育日期
+
+	for index, item := range config {
+		diseinfo_sun := make(map[string]interface{})
+		diseinfo_sun["diag_type"] = "1"              // 诊断类别
+		diseinfo_sun["diag_srt_no"] = index          // 诊断排序号
+		diseinfo_sun["diag_code"] = item.CountryCode // 诊断代码
+		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
+		diseinfo_sun["diag_dept"] = department       // 诊断科室
+		diseinfo_sun["dise_dor_no"] = doctor_id      // 诊断医生编码
+		diseinfo_sun["dise_dor_name"] = doctor       // 诊断医生姓名
+		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
+		diseinfo_sun["vali_flag"] = "1"              // 有效标志
+		diseinfo = append(diseinfo, diseinfo_sun)
+	}
+
 	input["diseinfo"] = diseinfo
 	input["mdtrtinfo"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -459,7 +460,7 @@ func Gdyb2203(psnNo string, mdtrtId string, doctor string, department string, di
 }
 
 // 门诊就诊信息上传
-func Gdyb2203A(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, dept string) string {
+func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, org_name string, med_type string, doctor_id int64, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, sick_code string, sick_name string, dept string, config []*models.HisXtDiagnoseConfig) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -478,7 +479,6 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, d
 	inputData["psn_no"] = psnNo           // 人员编号 （来自1101接口返回）
 	inputData["med_type"] = med_type      // 医疗类别 16门诊特殊病
 	inputData["begntime"] = timeFormatOne // 开始时间
-	inputData["begntime"] = "2021-04-10 12:20:30"
 
 	inputData["main_cond_dscr"] = ""    // 主要病情描述
 	inputData["dise_codg"] = sick_code  // 病种编码
@@ -489,20 +489,20 @@ func Gdyb2203A(psnNo string, mdtrtId string, doctor string, department string, d
 	inputData["matn_type"] = "" // 生育类别
 	inputData["geso_val"] = ""  // 孕周数
 
-	diseinfo_sun := make(map[string]interface{})
-	diseinfo_sun["diag_type"] = "1"           // 诊断类别
-	diseinfo_sun["diag_srt_no"] = "1"         // 诊断排序号
-	diseinfo_sun["diag_code"] = diag_code     // 诊断代码
-	diseinfo_sun["diag_name"] = diag          // 诊断名称
-	diseinfo_sun["diag_dept"] = department    // 诊断科室
-	diseinfo_sun["dise_dor_no"] = doctor_id   // 诊断医生编码
-	diseinfo_sun["dise_dor_name"] = doctor    // 诊断医生姓名
-	diseinfo_sun["diag_time"] = timeFormatOne // 诊断时间
-	diseinfo_sun["diag_time"] = "2021-04-10 12:20:30"
-
-	diseinfo_sun["vali_flag"] = "1" // 有效标志
+	for index, item := range config {
+		diseinfo_sun := make(map[string]interface{})
+		diseinfo_sun["diag_type"] = "1"              // 诊断类别
+		diseinfo_sun["diag_srt_no"] = index          // 诊断排序号
+		diseinfo_sun["diag_code"] = item.CountryCode // 诊断代码
+		diseinfo_sun["diag_name"] = item.ClassName   // 诊断名称
+		diseinfo_sun["diag_dept"] = department       // 诊断科室
+		diseinfo_sun["dise_dor_no"] = doctor_id      // 诊断医生编码
+		diseinfo_sun["dise_dor_name"] = doctor       // 诊断医生姓名
+		diseinfo_sun["diag_time"] = timeFormatOne    // 诊断时间
+		diseinfo_sun["vali_flag"] = "1"              // 有效标志
+		diseinfo = append(diseinfo, diseinfo_sun)
+	}
 
-	diseinfo = append(diseinfo, diseinfo_sun)
 	input["diseinfo"] = diseinfo
 	input["mdtrtinfo"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -708,7 +708,6 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["rxno"] = ""                     // 处方号
 		feedetailInfo["rx_circ_flag"] = "0"            // 外购处方标志
 		feedetailInfo["fee_ocur_time"] = timeFormatOne // 费用发生时间
-		feedetailInfo["fee_ocur_time"] = "2021-04-10 12:20:30"
 
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码

service/sz_his_service.go

@@ -65,7 +65,7 @@ func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_co
 	inputMessage["transType"] = "MZ002"         // 交易编码
 	inputMessage["transVersion"] = version_code // 交易编码
 
-	if medical_care == 11 {
+	if medical_care == 11 || medical_care == 1111 || medical_care == 1112 {
 		inputData["aka130"] = "11"
 	} else if medical_care == 13 {
 		inputData["aka130"] = "13"
@@ -317,7 +317,7 @@ func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total f
 	inputMessage["transVersion"] = version_code // 交易编码
 	inputData["akc190"] = mz_number
 
-	if medical_care == 11 {
+	if medical_care == 11 || medical_care == 1111 || medical_care == 1112 {
 		inputData["aka130"] = "11"
 	} else if medical_care == 13 {
 		inputData["aka130"] = "13"
@@ -378,7 +378,7 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total f
 
 	inputMessage["transVersion"] = version_code // 交易编码
 
-	if medical_care == 11 {
+	if medical_care == 11 || medical_care == 1111 || medical_care == 1112 {
 		inputData["aka130"] = "11"
 	} else if medical_care == 13 {
 		inputData["aka130"] = "13"