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

conf/app.conf

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

controllers/sz/sz_his_api_controller.go

@@ -2152,6 +2152,8 @@ func (c *SZHisApiController) GetSettleInfo() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 
+	order_id, _ := c.GetInt64("order_id")
+
 	sick_type, _ := c.GetInt64("sick_type")
 	reg_type, _ := c.GetInt64("p_type")
 
@@ -2179,7 +2181,8 @@ func (c *SZHisApiController) GetSettleInfo() {
 
 	his, err := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 
-	tempOrder, _ := service.GetNewHisOrderThree(his.Number)
+	//tempOrder, _ := service.GetNewHisOrderThree(or)
+	tempOrder, _ := service.GetHisOrderByID(order_id)
 
 	if tempOrder.ID == 0 {