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

controllers/sg/his_api_controller.go

@@ -103,7 +103,8 @@ func (c *HisApiController) GetSettleList() {
 		SetlId:         order.SetlId,
 		PsnName:        order.PsnName,
 		Gend:           order.Gend,
-		Brdy:           order.HisPatient.Brdy,
+		Brdy:           his.Brdy,
+		Age:            his.Age,
 		Naty:           order.Naty,
 		PatnCertType:   order.MdtrtCertType,
 		Certno:         order.Certno,
@@ -127,6 +128,7 @@ func (c *HisApiController) GetSettleList() {
 		HsorgOpter:     miConfig.InsuplcAdmdvs,
 		MedinsFillPsn:  curRoles.UserName,
 		MedinsFillDept: depart.Name,
+		IptMedType:     "2",
 	}
 	if order.SettleType == 1 {
 		t := time.Unix(int64(order.SettleAccountsDate), 0)
@@ -152,7 +154,7 @@ func (c *HisApiController) GetSettleList() {
 		struct4101.CustomStruct = append(struct4101.CustomStruct, tempFunPay)
 	}
 	var tempOpspdiseinfo service.OpspdiseinfoStruct
-	sickConfig, _ := service.FindSickById(his.SickType)
+	sickConfig, _ := service.FindDiagnoseById(his.Diagnosis)
 
 	tempOpspdiseinfo.DiagCode = sickConfig.CountryCode
 	tempOpspdiseinfo.DiagName = sickConfig.CountryContentName

service/gdyb_service.go

@@ -2150,6 +2150,8 @@ type Struct4101 struct {
 	HsorgOpter         string
 	MedinsFillDept     string
 	MedinsFillPsn      string
+	IptMedType         string
+	Age                int64
 	CustomStruct       []CustomStruct
 	OpspdiseinfoStruct []OpspdiseinfoStruct
 	IteminfoStruct     []IteminfoStruct
@@ -2271,11 +2273,13 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 
 	diseinfo := make([]map[string]interface{}, 0) // 住院诊断信息
 	diseinfotemp := make(map[string]interface{})
-	diseinfotemp["diag_type"] = ""     // 诊断类别  必填
-	diseinfotemp["diag_code"] = ""     // 诊断代码 必填
-	diseinfotemp["diag_name"] = ""     // 诊断名称 必填
-	diseinfotemp["adm_cond_type"] = "" // 入院病情类型 必填
-	diseinfo = append(diseinfo, diseinfotemp)
+	for _, item := range struct4101.OpspdiseinfoStruct {
+		diseinfotemp["diag_type"] = "1"           // 诊断类别  必填
+		diseinfotemp["diag_code"] = item.DiagCode // 诊断代码 必填
+		diseinfotemp["diag_name"] = item.DiagName // 诊断名称 必填
+		diseinfotemp["adm_cond_type"] = "3"       // 入院病情类型 必填
+		diseinfo = append(diseinfo, diseinfotemp)
+	}
 
 	iteminfo := make([]map[string]interface{}, 0) // 住院诊断信息
 	iteminfotemp := make(map[string]interface{})
@@ -2312,11 +2316,11 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 
 	input["setlinfo"] = inputData
 	input["payinfo"] = payinfo
-	input["opspdiseinfo"] = opspdiseinfo
+	//input["opspdiseinfo"] = opspdiseinfo
 	input["diseinfo"] = diseinfo
 	input["iteminfo"] = iteminfo
 	input["oprninfo"] = oprninfo
-	input["icuinfo"] = icuinfo
+	//input["icuinfo"] = icuinfo
 	inputMessage["input"] = input //交易输入
 
 	bytesData, err := json.Marshal(inputMessage)