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

controllers/sz/sz_his_api_controller.go

@@ -809,10 +809,8 @@ func (c *SZHisApiController) GetRegisterInfo() {
 	}
 	//doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
 	doctorDepartment, _ := service.GetDepartMentDetail(department)
-
 	adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
 	his, _ := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient_id, theTime.Unix())
-
 	var custom_code string
 	var custom_project_name string
 	var allPrice float64
@@ -847,28 +845,21 @@ func (c *SZHisApiController) GetRegisterInfo() {
 
 		break
 	}
-
 	if his.ID == 0 {
-
 		var opera_name string
 		var opera_code string
 		if adminRole.ID == 0 {
-
 			opera_name = "管理员"
 			opera_code = "01"
-
 		} else {
 			opera_name = adminRole.UserName
 			opera_code = strconv.FormatInt(admin_user_id, 10)
-
 		}
 		month := time.Unix(1557042972, 0).Format("1")
 		year := time.Now().Format("2006")
 		month = time.Now().Format("01")
 		day := time.Now().Format("02")
-
 		//流水号
-		//
 		number := miConfig.Code + year + month + day +
 			fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）
 		mz_number := miConfig.Code + year + month + day +
@@ -1977,8 +1968,8 @@ 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, his.MedicalTreatmentType)
+				sick, _ := service.FindSickById(patientPrescription.SickType)
+				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, sick.CountryCode)
 				var dat map[string]interface{}
 				if err := json.Unmarshal([]byte(result_three), &dat); err == nil {
 					fmt.Println(dat)

service/sz_his_service.go

@@ -314,7 +314,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, medical_care int64) 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, code string) string {
 	// 生成输入报文
 	inputMessage := SetSZInputMessage(doctor, doctor_code, fixmedins_code, verify_code, serial_number)
 	inputData := make(map[string]interface{})
@@ -326,7 +326,7 @@ func SzybFY005(doctor string, doctor_code string, fixmedins_code string, total f
 		inputData["aka130"] = "11"
 	} else if medical_care == 13 {
 		inputData["aka130"] = "13"
-		inputData["cka303"] = "Z99.2"
+		inputData["cka303"] = code
 	} else {
 		inputData["aka130"] = fmt.Sprintf("%d", medical_care)
 	}