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

controllers/sg/his_api_controller.go

@@ -1691,8 +1691,19 @@ func (c *HisApiController) GetBatchSettleList() {
 		var res ResultSeventeen
 		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
 			utils.ErrorLog("解析失败：%v", err)
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
+			//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			adminUser := c.GetAdminUserInfo()
+			errlog := &models.HisOrderError{
+				UserOrgId: adminUser.CurrentOrgId,
+				Ctime:     time.Now().Unix(),
+				Mtime:     time.Now().Unix(),
+				ErrMsg:    res.ErrMsg + "解析失败",
+				Status:    1,
+				PatientId: item.ID,
+				Stage:     20,
+			}
+			service.CreateErrMsgLog(errlog)
+			continue
 		}
 
 		if res.Infcode != 0 {

service/his_service.go

@@ -1364,6 +1364,6 @@ func GetPsnByPatientId(patient_id int64) (psn models.HisPsn, err error) {
 }
 
 func GetAllHisOrder(org_id int64) (his []*models.HisOrder, err error) {
-	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND setl_id <> '' AND id >= 1755", org_id).Order("setl_time asc").Find(&his).Error
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND order_status = 2 AND setl_id <> '' AND id >= 2499", org_id).Order("setl_time asc").Find(&his).Error
 	return
 }