Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/his_api_controller.go

@@ -543,7 +543,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								if prescribingNumberUnit == drug.MinUnit {
 									if prescribing_number > drug.Total {
-										//c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
@@ -551,7 +551,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if num > drug.Total {
-											//c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 											return
 										}
@@ -596,8 +596,7 @@ func (c *HisApiController) CreateHisPrescription() {
 										return
 									}
 									if totals > good.Total {
-										//c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
-
+										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
 										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
@@ -3220,6 +3219,12 @@ func (c *HisApiController) RefundNumber() {
 	his_patient_id, _ := c.GetInt64("id")
 	info, _ := service.GetNewHisPatientInfo(his_patient_id)
 	info.Status = 0
+	count, _ := service.GetOrderCountByNumber(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.RecordDate, info.Number)
+	if count > 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOrderParamWrong)
+		return
+	}
+
 	err := service.SaveHisPatient(info)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -324,7 +324,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 
 								if prescribingNumberUnit == drug.MinUnit {
 									if prescribing_number > drug.Total {
-										//c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
@@ -332,7 +332,7 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 									if prescribingNumberUnit == drug.MaxUnit {
 										num := prescribing_number * float64(drug.MinNumber)
 										if num > drug.Total {
-											//c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 
 											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 											return
@@ -377,9 +377,9 @@ func (c *MobileHisApiController) CreateHisPrescription() {
 										return
 									}
 									if totals > good.Total {
-										//c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
-
-										//c.ServeFailJSONWithSGJErro，rCode(enums.ErrorCodeOutOfStockParamWrong)
+										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
+										//
+										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
 										return
 									}
 

service/his_service.go

@@ -2100,3 +2100,9 @@ func GetNewAllUnChargeHisPatientListTwo(org_id int64, keywords string, record_da
 
 	return
 }
+
+func GetOrderCountByNumber(org_id int64, patient_id int64, record_time int64, number string) (count int64, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = ? AND status = 1 AND patient_id = ? AND settle_accounts_date = ? AND order_status = 3 AND mdtrt_id = ?", org_id, patient_id, record_time, number).Count(&count).Error
+
+	return
+}