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

controllers/sg/gdyb_controller.go

@@ -236,7 +236,7 @@ func (c *GdybController) PostFive() {
 	fmt.Println(respJSON["secret_key"].(string))
 
 	result := service.Gdyb2204(respJSON["psn_no"].(string), respJSON["mdtrt_id"].(string), hp, respJSON["chrg_bchno"].(string), respJSON["org_name"].(string),
-		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string))
+		respJSON["doctor"].(string), respJSON["dept"].(string), respJSON["fixmedins_code"].(string), respJSON["dept_code"].(string), respJSON["doctor_id"].(string), respJSON["insuplc_admdvs"].(string), respJSON["mdtrtarea_admvs"].(string), respJSON["secret_key"].(string), respJSON["balance_accounts_type"].(string))
 
 	var dat map[string]interface{}
 	if err := json.Unmarshal([]byte(result), &dat); err == nil {

controllers/sg/his_api_controller.go

@@ -3149,6 +3149,8 @@ func (c *HisApiController) GetPreUploadInfo() {
 		data["doctor_id"] = strconv.FormatInt(roles.AdminUserId, 10)
 		data["dept"] = strconv.FormatInt(patientPrescription.Departments, 10)
 		data["fixmedins_code"] = miConfig.Code
+		data["balance_accounts_type"] = strconv.FormatInt(his.BalanceAccountsType, 10)
+
 		if (department.ID == 0 && adminUser.CurrentOrgId == 9919) || (department.ID == 0 && adminUser.CurrentOrgId == 10106) {
 			data["dept_code"] = "15"
 		} else {

service/gdyb_service.go

@@ -608,7 +608,7 @@ type Result struct {
 }
 
 //  门诊费用明细信息上传
-func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
+func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -701,14 +701,13 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	for _, item := range customs {
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["feedetl_sn"] = item.FeedetlSn
-		feedetailInfo["mdtrt_id"] = mdtrtId            // 就诊 ID（来自2201接口返回）
-		feedetailInfo["psn_no"] = psnNo                // 人员编号 （来自1101接口返回）
-		feedetailInfo["chrg_bchno"] = chrg_bchno       // 收费批次号
-		feedetailInfo["dise_codg"] = ""                // 病种编码
-		feedetailInfo["rxno"] = ""                     // 处方号
-		feedetailInfo["rx_circ_flag"] = "0"            // 外购处方标志
-		feedetailInfo["fee_ocur_time"] = timeFormatOne // 费用发生时间
-
+		feedetailInfo["mdtrt_id"] = mdtrtId                          // 就诊 ID（来自2201接口返回）
+		feedetailInfo["psn_no"] = psnNo                              // 人员编号 （来自1101接口返回）
+		feedetailInfo["chrg_bchno"] = chrg_bchno                     // 收费批次号
+		feedetailInfo["dise_codg"] = ""                              // 病种编码
+		feedetailInfo["rxno"] = ""                                   // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"                          // 外购处方标志
+		feedetailInfo["fee_ocur_time"] = timeFormatOne               // 费用发生时间
 		feedetailInfo["med_list_codg"] = item.MedListCodg            // 医疗目录编码
 		feedetailInfo["medins_list_codg"] = fixmedins_code           // 医药机构目录编码
 		feedetailInfo["det_item_fee_sumamt"] = item.DetItemFeeSumamt // 明细项目费用总额
@@ -726,19 +725,24 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 		feedetailInfo["acord_dept_name"] = ""                        // 受单科室名称
 		feedetailInfo["orders_dr_code"] = ""                         // 受单医生编码
 		feedetailInfo["orders_dr_name"] = ""                         // 受单医生姓名
+		if balance_accounts_type == "8" {
+			feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+		} else {
 
-		if item.HospApprFlag != -1 {
-			if item.HospApprFlag == 1 {
-				feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
-			} else if item.HospApprFlag == 2 {
-				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
-			} else if item.HospApprFlag == 3 {
-				feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+			if item.HospApprFlag != -1 {
+				if item.HospApprFlag == 1 {
+					feedetailInfo["hosp_appr_flag"] = "0" // 医院审批标志
+				} else if item.HospApprFlag == 2 {
+					feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+				} else if item.HospApprFlag == 3 {
+					feedetailInfo["hosp_appr_flag"] = "2" // 医院审批标志
+				} else {
+					feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+				}
 			} else {
 				feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
 			}
-		} else {
-			feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
+
 		}
 
 		feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式