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

controllers/sz/sz_his_api_controller.go

@@ -940,7 +940,6 @@ func (c *SZHisApiController) GetSettleInfo() {
 			ress = append(ress, &res)
 		} else {
 			isSuccess = false
-			//结算报错
 			errlog := &models.HisOrderError{
 				UserOrgId:  adminUser.CurrentOrgId,
 				Ctime:      time.Now().Unix(),
@@ -953,20 +952,15 @@ func (c *SZHisApiController) GetSettleInfo() {
 				Stage:      4,
 			}
 			service.CreateErrMsgLog(errlog)
-
 			c.ServeSuccessJSON(map[string]interface{}{
 				"failed_code": -10,
 				"msg":         res.Transreturnmessage,
 			})
-
-			//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePreSettleFaildParamWrong)
 			return
 		}
 		//设置变量，根据变量的值来判断上传是否成功
 	}
-
 	if isSuccess == true {
-
 		order := &models.HisOrder{
 			UserOrgId:           adminUser.CurrentOrgId,
 			HisPatientId:        0,
@@ -1046,7 +1040,6 @@ func (c *SZHisApiController) GetSettleInfo() {
 		}
 		service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
 		service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, patient_id, chrg_bchno, recordDateTime)
-
 		var total float64
 		for _, item := range prescriptions {
 			if item.Type == 1 { //药品
@@ -1124,6 +1117,19 @@ func (c *SZHisApiController) GetSettleInfo() {
 						"msg": "结算成功",
 					})
 				} else {
+					//结算报错
+					errlog := &models.HisOrderError{
+						UserOrgId:  adminUser.CurrentOrgId,
+						Ctime:      time.Now().Unix(),
+						Mtime:      time.Now().Unix(),
+						Number:     chrg_bchno,
+						ErrMsg:     res.Transreturnmessage,
+						Status:     1,
+						PatientId:  patient_id,
+						RecordTime: recordDateTime,
+						Stage:      6,
+					}
+					service.CreateErrMsgLog(errlog)
 					c.ServeSuccessJSON(map[string]interface{}{
 						"failed_code": -10,
 						"msg":         res.Transreturnmessage,

routers/router.go

@@ -2,8 +2,6 @@ package routers
 
 import (
 	"gdyb/controllers/sg"
-	//"gdyb/controllers/sg"
-	//"gdyb/controllers/sz"
 
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"