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

controllers/sg/his_api_controller.go

@@ -5315,7 +5315,7 @@ func (c *HisApiController) GetSettleAccounts() {
 
 			api := "http://192.168.124.4:9532/" + "hbyb/5203?psn_no=" + businessParams.PsnNo + "&mdtrt_id=" + businessParams.MdtrtId + "&setl_id=" + businessParams.SetlId +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + baseParams.Doctor + "&fixmedins_code=" + miConfig.Code +
-				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey + "&med_type=" + order.MedType
+				"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -5324,14 +5324,14 @@ func (c *HisApiController) GetSettleAccounts() {
 
 			body, ioErr := ioutil.ReadAll(resp.Body)
 			if ioErr != nil {
-				//utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
-				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 			var respJSON map[string]interface{}
 			if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
-				//utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
-				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 
@@ -5340,15 +5340,11 @@ func (c *HisApiController) GetSettleAccounts() {
 			fmt.Println("log")
 			fmt.Println(string(result))
 			if err := json.Unmarshal([]byte(result), &res); err != nil {
-				//utils.ErrorLog("解析失败：%v", err)
-				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				utils.ErrorLog("解析失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
 
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "成功",
-			})
-
 		} else {
 			result := service.Gdyb5203(baseParams, businessParams)
 			var dat map[string]interface{}
@@ -5363,97 +5359,97 @@ func (c *HisApiController) GetSettleAccounts() {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 				return
 			}
+		}
 
-			printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-			charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
+		printor_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+		charge_admin, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, order.Creator)
 
-			patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, order.PatientId, order.SettleAccountsDate)
-			adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
+		patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, order.PatientId, order.SettleAccountsDate)
+		adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
-			roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+		roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 
-			var doctor_name string
-			if roles.ID == 0 {
-				doctor_name = "管理员"
-			} else {
-				doctor_name = roles.UserName
-			}
+		var doctor_name string
+		if roles.ID == 0 {
+			doctor_name = "管理员"
+		} else {
+			doctor_name = roles.UserName
+		}
 
-			yiliao_leibie := ""
+		yiliao_leibie := ""
 
-			switch order.MedType {
-			case "11":
-				yiliao_leibie = "普通门诊"
-				break
-			case "12":
-				yiliao_leibie = "门诊挂号"
-				break
-			case "13":
-				yiliao_leibie = "急诊"
-				break
-			case "14":
-				yiliao_leibie = "门诊特殊病"
-				break
-			case "15":
-				yiliao_leibie = "门诊统筹"
-				break
-			case "16":
-				yiliao_leibie = "门诊慢性病"
-				break
-			case "21":
-				yiliao_leibie = "普通住院"
-				break
-			}
-			departments, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+		switch order.MedType {
+		case "11":
+			yiliao_leibie = "普通门诊"
+			break
+		case "12":
+			yiliao_leibie = "门诊挂号"
+			break
+		case "13":
+			yiliao_leibie = "急诊"
+			break
+		case "14":
+			yiliao_leibie = "门诊特殊病"
+			break
+		case "15":
+			yiliao_leibie = "门诊统筹"
+			break
+		case "16":
+			yiliao_leibie = "门诊慢性病"
+			break
+		case "21":
+			yiliao_leibie = "普通住院"
+			break
+		}
+		departments, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 
-			if res.Infcode == 0 {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"diagnosis":                                   name,
-					"order_infos":                                 orderInfos,
-					"number":                                      order.MdtrtId,
-					"date":                                        order.SettleAccountsDate,
-					"charge_admin":                                charge_admin,
-					"printor_admin":                               printor_admin,
-					"info":                                        res.Output.Setlinfo,
-					"bedCostTotal":                                bedCostTotal,
-					"bedCostSelfTotal":                            bedCostSelfTotal,
-					"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
-					"operationCostTotal":                          operationCostTotal,
-					"operationCostSelfTotal":                      operationCostSelfTotal,
-					"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
-					"otherCostTotal":                              otherCostTotal,
-					"otherCostSelfTotal":                          otherCostSelfTotal,
-					"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
-					"materialCostTotal":                           materialCostTotal,
-					"materialCostSelfTotal":                       materialCostSelfTotal,
-					"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
-					"westernMedicineCostTotal":                    westernMedicineCostTotal,
-					"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
-					"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
-					"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
-					"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
-					"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
-					"checkCostTotal":                              checkCostTotal,
-					"checkCostSelfTotal":                          checkCostSelfTotal,
-					"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
-					"laboratoryCostTotal":                         laboratoryCostTotal,
-					"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
-					"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
-					"treatCostTotal":                              treatCostTotal,
-					"treatCostSelfTotal":                          treatCostSelfTotal,
-					"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
-					"doctor_code":                                 adminRole_two.DoctorCode,
-					"doctor_name":                                 doctor_name,
-					"health_card_no":                              order.PsnNo,
-					"department":                                  departments.Name,
-					"yiliao_leibie":                               yiliao_leibie,
-					"after_money":                                 order.AccountPrice,
-					"patient":                                     patient,
-					"org_name":                                    miConfig.OrgName,
-					"org_code":                                    miConfig.Code,
-					"order_number":                                order.Number,
-				})
-			}
+		if res.Infcode == 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"diagnosis":                                   name,
+				"order_infos":                                 orderInfos,
+				"number":                                      order.MdtrtId,
+				"date":                                        order.SettleAccountsDate,
+				"charge_admin":                                charge_admin,
+				"printor_admin":                               printor_admin,
+				"info":                                        res.Output.Setlinfo,
+				"bedCostTotal":                                bedCostTotal,
+				"bedCostSelfTotal":                            bedCostSelfTotal,
+				"bedCostPartSelfTotal":                        bedCostPartSelfTotal,
+				"operationCostTotal":                          operationCostTotal,
+				"operationCostSelfTotal":                      operationCostSelfTotal,
+				"operationCostPartSelfTotal":                  operationCostPartSelfTotal,
+				"otherCostTotal":                              otherCostTotal,
+				"otherCostSelfTotal":                          otherCostSelfTotal,
+				"otherCostPartSelfTotal":                      otherCostPartSelfTotal,
+				"materialCostTotal":                           materialCostTotal,
+				"materialCostSelfTotal":                       materialCostSelfTotal,
+				"materialCostPartSelfTotal":                   materialCostPartSelfTotal,
+				"westernMedicineCostTotal":                    westernMedicineCostTotal,
+				"westernMedicineCostSelfTotal":                westernMedicineCostSelfTotal,
+				"westernMedicineCostPartSelfTotal":            westernMedicineCostPartSelfTotal,
+				"chineseTraditionalMedicineCostTotal":         chineseTraditionalMedicineCostTotal,
+				"chineseTraditionalMedicineCostSelfTotal":     chineseTraditionalMedicineCostSelfTotal,
+				"chineseTraditionalMedicineCostPartSelfTotal": chineseTraditionalMedicineCostPartSelfTotal,
+				"checkCostTotal":                              checkCostTotal,
+				"checkCostSelfTotal":                          checkCostSelfTotal,
+				"checkCostPartSelfTotal":                      checkCostPartSelfTotal,
+				"laboratoryCostTotal":                         laboratoryCostTotal,
+				"laboratoryCostSelfTotal":                     laboratoryCostSelfTotal,
+				"laboratoryCostPartSelfTotal":                 laboratoryCostPartSelfTotal,
+				"treatCostTotal":                              treatCostTotal,
+				"treatCostSelfTotal":                          treatCostSelfTotal,
+				"treatCostPartSelfTotal":                      treatCostPartSelfTotal,
+				"doctor_code":                                 adminRole_two.DoctorCode,
+				"doctor_name":                                 doctor_name,
+				"health_card_no":                              order.PsnNo,
+				"department":                                  departments.Name,
+				"yiliao_leibie":                               yiliao_leibie,
+				"after_money":                                 order.AccountPrice,
+				"patient":                                     patient,
+				"org_name":                                    miConfig.OrgName,
+				"org_code":                                    miConfig.Code,
+				"order_number":                                order.Number,
+			})
 		}
 	}