Browse Source

耗材参数

XMLWAN 4 years ago
parent
commit
19dc559f33

+ 10 - 10
controllers/dialysis_api_controller.go View File

@@ -244,8 +244,8 @@ func (c *DialysisApiController) PostPrescription() {
244 244
 	//fmt.Println("下机前推注鱼精蛋白",push_the_protamine)
245 245
 	// var prescription_doctor int64
246 246
 	blood := c.GetString("blood")
247
-	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
248
-	dialysis_irrigation := c.GetString("dialysis_irrigation")
247
+	//dialysis_dialyszers := c.GetString("dialysis_dialyszers")
248
+	//dialysis_irrigation := c.GetString("dialysis_irrigation")
249 249
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
250 250
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
251 251
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -326,9 +326,9 @@ func (c *DialysisApiController) PostPrescription() {
326 326
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
327 327
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
328 328
 		Blood:                      blood,
329
-		DialysisDialyszers:         dialysis_dialyszers,
330
-		DialysisIrrigation:         dialysis_irrigation,
331
-		AntioxidantCommodityName:   antioxidant_commodity_name,
329
+		//DialysisDialyszers:         dialysis_dialyszers,
330
+		//DialysisIrrigation:         dialysis_irrigation,
331
+		AntioxidantCommodityName: antioxidant_commodity_name,
332 332
 	}
333 333
 
334 334
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -495,8 +495,8 @@ func (c *DialysisApiController) PostSoulution() {
495 495
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
496 496
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
497 497
 	blood := c.GetString("blood")
498
-	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
499
-	dialysis_irrigation := c.GetString("dialysis_irrigation")
498
+	//dialysis_dialyszers := c.GetString("dialysis_dialyszers")
499
+	//dialysis_irrigation := c.GetString("dialysis_irrigation")
500 500
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
501 501
 	var prescription_doctor int64
502 502
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -588,9 +588,9 @@ func (c *DialysisApiController) PostSoulution() {
588 588
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
589 589
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
590 590
 		Blood:                     blood,
591
-		DialysisIrrigation:        dialysis_irrigation,
592
-		DialysisDialyszers:        dialysis_dialyszers,
593
-		AntioxidantCommodityName:  antioxidant_commodity_name,
591
+		//DialysisIrrigation:        dialysis_irrigation,
592
+		//DialysisDialyszers:        dialysis_dialyszers,
593
+		AntioxidantCommodityName: antioxidant_commodity_name,
594 594
 	}
595 595
 
596 596
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)

+ 2 - 2
controllers/his_api_controller.go View File

@@ -64,9 +64,9 @@ func HisManagerApiRegistRouters() {
64 64
 
65 65
 	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
66 66
 
67
-	beego.Router("/api/hisprescription/get", &DialysisApiController{}, "Get:GetLastOrNextHisPrescription")
67
+	beego.Router("/api/hisprescription/get", &HisApiController{}, "Get:GetLastOrNextHisPrescription")
68 68
 
69
-	beego.Router("/api/callhisprescription/get", &DialysisApiController{}, "Get:GetCallHisPrescription")
69
+	beego.Router("/api/callhisprescription/get", &HisApiController{}, "Get:GetCallHisPrescription")
70 70
 
71 71
 	beego.Router("/api/dayprescription/get", &HisApiController{}, "get:GetHisDayPrescription")
72 72
 

+ 1 - 1
controllers/mobile_api_controllers/patient_api_controller.go View File

@@ -1545,7 +1545,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
1545 1545
 	if evaluation.DryWeight > 0 {
1546 1546
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
1547 1547
 
1548
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 {
1548
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 {
1549 1549
 			dewater_amount = dewater_amount * 1000
1550 1550
 
1551 1551
 		}

+ 13 - 11
controllers/stock_api_controller.go View File

@@ -288,18 +288,20 @@ func (c *StockApiController) ModifyManufacturer() {
288 288
 		PinYin:           pinyin,
289 289
 	}
290 290
 
291
-	_, errcode := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
292
-	if errcode == gorm.ErrRecordNotFound {
293
-		err := service.ModifyManufacturer(&manufacturer)
291
+	Manufacturer, _ := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
294 292
 
295
-		if err == nil {
296
-			c.ServeSuccessJSON(map[string]interface{}{
297
-				"manufacturer": manufacturer,
298
-			})
299
-		} else {
300
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
301
-		}
302
-	} else if errcode == nil {
293
+	if Manufacturer.ID > 0 && Manufacturer.ID != manufacturer.ID {
294
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIdCardNoExist)
295
+		return
296
+	}
297
+
298
+	err := service.ModifyManufacturer(&manufacturer)
299
+
300
+	if err == nil {
301
+		c.ServeSuccessJSON(map[string]interface{}{
302
+			"manufacturer": manufacturer,
303
+		})
304
+	} else {
303 305
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
304 306
 	}
305 307