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

conf/app.conf

@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10138
+org_id = 9504
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

service/sz_his_service.go

@@ -309,22 +309,33 @@ func SzybFY002(doctor string, doctor_code string, fixmedins_code string, datas [
 	str := string(respBytes)
 	return str
 }
-func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, verify_code string, serial_number string, mz_number string, version_code string, drug_doctor_code string, drug_doctor_name string) string {
-	// 生成输入报文
+func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total float64, account string, verify_code string, serial_number string, mz_number string, version_code string, drug_doctor string, drug_doctor_name string, medical_care int64, code string) string {
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
-	inputMessage["transType"] = "FY004"         // 交易编码
-	inputMessage["transVersion"] = version_code // 交易编码
+	inputMessage["transType"] = "FY004" // 交易编码
 
+	inputMessage["transVersion"] = version_code // 交易编码
 	inputData["akc190"] = mz_number
-	inputData["aka130"] = "11"
-	inputData["bkc320"] = drug_doctor_code
+
+	if medical_care == 11 {
+		inputData["aka130"] = "11"
+	} else if medical_care == 13 {
+		inputData["aka130"] = "13"
+		inputData["cka303"] = code
+	} else {
+		inputData["aka130"] = fmt.Sprintf("%d", medical_care)
+	}
+	inputData["bkc320"] = drug_doctor
 	inputData["ckc350"] = drug_doctor_name
+
+	inputData["bzz269"] = "000000"
 	inputData["aka030"] = "12"
 	inputData["akc264"] = total
 	inputData["ckc601"] = "0"
 	inputData["bke384"] = serial_number
+
 	inputMessage["transBody"] = inputData
+
 	bytesData, err := json.Marshal(inputMessage)
 	fmt.Println(string(bytesData))
 	if err != nil {