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

controllers/sg/his_api_controller.go

@@ -8965,30 +8965,31 @@ func (c *HisApiController) GetSettleAccounts() {
 
 		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,
+				"diagnosis":                               name,
+				"order_infos":                             orderInfos,
+				"number":                                  order.MdtrtId,
+				"date":                                    order.SettleAccountsDate,
+				"charge_admin":                            charge_admin,
+				"printor_admin":                           printor_admin,
+				"info":                                    res.Output.Setlinfo,
+				"order":                                   order,
+				"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,