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

service/jsyb_service.go

@@ -413,6 +413,8 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
 	for _, item := range customs {
 		feedetailInfo := make(map[string]interface{})
+		subfeedetailInfo := make(map[string]interface{})
+
 		feedetailInfo["feedetl_sn"] = item.FeedetlSn
 		feedetailInfo["mdtrt_id"] = mdtrtId                          // 就诊 ID（来自2201接口返回）
 		feedetailInfo["psn_no"] = psnNo                              // 人员编号 （来自1101接口返回）
@@ -462,6 +464,9 @@ func Jsyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
 		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志
 		feedetailInfo["matn_fee_flag"] = ""    // 生育费用标志
+		subfeedetailInfo["tcmherb_prov_code"] = item.ProvinceDrugMedListCodg
+		subfeedetailInfo["mcs_prov_code"] = item.ProvinceGoodMedListCodg
+		feedetailInfo["expContent"] = subfeedetailInfo
 		feedetail = append(feedetail, feedetailInfo)
 	}
 	input["feedetail"] = feedetail