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

controllers/sg/his_api_controller.go

@@ -8295,7 +8295,7 @@ func (c *HisApiController) GetSettleAccounts() {
 	orderInfos, _ := service.GetHisOrderInfoByNumber(order.Number)
 	orderInfos_two, _ := service.GetHisOrderInfoByNumberTwo(order.Number)
 	orderInfos = append(orderInfos, orderInfos_two...)
-	his_hospital, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
+	//his_hospital, _ := service.GetInHospitalRecordByNumber(order.MdtrtId)
 
 	//diagnosisConfig, _ := service.FindDiagnoseById(his.Diagnosis)