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

conf/app.conf

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

controllers/sz/sz_his_api_controller.go

@@ -4278,35 +4278,35 @@ func (c *SZHisApiController) GetSettleAccounts() {
 	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, order.SettleAccountsDate)
 	yiliao_leibie := ""
 
-	switch his.MedicalTreatmentType {
-	case 11:
+	switch order.MedType {
+	case "11":
 		yiliao_leibie = "普通门诊"
 		break
-	case 12:
+	case "12":
 		yiliao_leibie = "家庭通道"
 		break
-	case 13:
+	case "13":
 		yiliao_leibie = "门诊大病"
 		break
-	case 14:
+	case "14":
 		yiliao_leibie = "重疾特药"
 		break
-	case 15:
+	case "15":
 		yiliao_leibie = "门诊慢病"
 		break
-	case 16:
+	case "16":
 		yiliao_leibie = "门诊特检"
 		break
-	case 17:
+	case "17":
 		yiliao_leibie = "健康体检"
 		break
-	case 18:
+	case "18":
 		yiliao_leibie = "预防接种"
 		break
-	case 19:
+	case "19":
 		yiliao_leibie = "门诊输血"
 		break
-	case 91:
+	case "91":
 		yiliao_leibie = "新冠肺炎门诊"
 		break