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

controllers/zh/zh_his_api_controller.go

@@ -1589,6 +1589,8 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				}
 
 				err := service.UpDatePrescriptionOrderStatus(adminUser.CurrentOrgId, ids)
+				service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, record.Number)
+				service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, patientPrescription.PatientId, record.Number, recordDateTime)
 				if err == nil {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg": "上传费用明细成功",
@@ -1876,10 +1878,10 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 			}
 
 			if res2.Infcode == 0 {
-				err := service.UpdataOrderStatus(order_id, record.Number, adminUser.CurrentOrgId, "", result)
+				err := service.UpdataHospitalOrderStatus(order_id, record.Number, adminUser.CurrentOrgId)
 				if err == nil {
 					c.ServeSuccessJSON(map[string]interface{}{
-						"msg": "退费成功",
+						"msg": "撤销明细成功",
 					})
 				} else {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -1891,18 +1893,7 @@ func (c *ZHHisApiController) ZHRefundDetail() {
 					"msg":  res2.ErrMsg,
 				})
 			}
-		} else {
-			err := service.UpdataOrderStatus(order_id, record.Number, adminUser.CurrentOrgId, "", "")
-			if err == nil {
-				c.ServeSuccessJSON(map[string]interface{}{
-					"msg": "退费成功",
-				})
-			} else {
-				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-				return
-			}
 		}
-
 	}
 
 }

service/his_service.go

@@ -1375,3 +1375,11 @@ func UpdataOrderStatusByNumber(number string) (err error) {
 	return
 
 }
+
+func UpdataHospitalOrderStatus(id int64, number string, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisOrderInfo{}).Where("status = 1 AND order_number = ? AND user_org_id = ?", id, number, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
+	return
+
+}