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

controllers/sz/sz_his_api_controller.go

@@ -457,7 +457,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 				if is_yidi == 1 {
 					//本地就医流程
 					//挂号
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
+					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, dept_code, yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
@@ -521,7 +521,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 					//tempPatient, _ := service.GetPatientByNumber(id_card_number, adminInfo.CurrentOrgId)
 					//if tempPatient.ID == patient_id {
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
+					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
@@ -586,7 +586,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 				//fmt.Println(readCardBasResult)
 				//是否异地就医，是的话走鉴权流程，不是的话走门诊挂号
 				if is_yidi == 1 { //1本地就医
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
+					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
@@ -647,7 +647,7 @@ func (c *SZHisApiController) GetRegisterInfo() {
 				} else { //异地就医需要走鉴权流程
 					//authResult := CardAuth(number)
 					//fmt.Println(authResult)
-					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice)
+					resp_result := service.SzybMZ002(doctor_name, doctor_code, miConfig.Code, "0305", yiliao_number, verifyCode, number, mz_number, version_code, custom_code, custom_project_name, allPrice, medical_care)
 					var dat map[string]interface{}
 					if err := json.Unmarshal([]byte(resp_result), &dat); err == nil {
 						fmt.Println(dat)
@@ -1071,7 +1071,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 			tempPatient, _ := service.GetPatientByNumber(id_card_number, adminUser.CurrentOrgId)
 			if tempPatient.ID == patient_id {
 
-				result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name)
+				result_three := service.SzybFY005(doctor_name, doctor_code, miConfig.Code, total, yiliao_number, verifyCode, number, mz_number, version_code, drug_doctor_code, drug_doctor_name, his.MedicalTreatmentType)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 					fmt.Println(dat)

service/sz_his_service.go

@@ -13,17 +13,24 @@ import (
 	_ "unsafe"
 )
 
-func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string, mz_number string, version_code string, custom_code string, project_name string, price float64) string {
+func SzybMZ002(doctor string, doctor_code string, fixmedins_code string, dept_code string, account string, verify_code string, serial_number string, mz_number string, version_code string, custom_code string, project_name string, price float64, medical_care int64) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
 	inputMessage["transType"] = "MZ002"         // 交易编码
 	inputMessage["transVersion"] = version_code // 交易编码
 
+	if medical_care == 11 {
+		inputData["aka130"] = "11"
+	} else if medical_care == 13 {
+		inputData["aka130"] = "13"
+	} else {
+		inputData["aka130"] = fmt.Sprintf("%d", medical_care)
+	}
+
 	inputData["akc190"] = mz_number
 	inputData["aaz500"] = account
 	inputData["bzz269"] = "000000"
-	inputData["aka130"] = "13"
 	inputData["akf001"] = dept_code
 	inputData["akc264"] = price
 	inputData["bke384"] = inputMessage["serialNumber"]
@@ -301,7 +308,7 @@ func SzybFY004(doctor string, doctor_code string, fixmedins_code string, total f
 	str := string(respBytes)
 	return str
 }
-func SzybFY005(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) string {
+func SzybFY005(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) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
@@ -309,17 +316,23 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total f
 
 	inputMessage["transVersion"] = version_code // 交易编码
 
+	if medical_care == 11 {
+		inputData["aka130"] = "11"
+	} else if medical_care == 13 {
+		inputData["aka130"] = "13"
+		inputData["cka303"] = "Z99.2"
+	} else {
+		inputData["aka130"] = fmt.Sprintf("%d", medical_care)
+	}
 	inputData["aaz500"] = account
 	inputData["bzz269"] = "000000"
 	inputData["akc190"] = mz_number
-	inputData["aka130"] = "13"
 	inputData["bkc320"] = drug_doctor
 	inputData["ckc350"] = drug_doctor_name
 	inputData["aka030"] = "12"
 	inputData["akc264"] = total
 	inputData["ckc601"] = "0"
 	inputData["bke384"] = serial_number
-	inputData["cka303"] = "Z99.2"
 
 	inputMessage["transBody"] = inputData