28169 hace 2 años
padre
commit
883fada3ce

+ 1 - 1
conf/app.conf Ver fichero

1
 appname = 血透
1
 appname = 血透
2
 httpport = 9531
2
 httpport = 9531
3
-runmode = prod
3
+runmode = dev
4
 #dev/prod
4
 #dev/prod
5
 
5
 
6
 #
6
 #

+ 5 - 0
controllers/dialysis_api_controller.go Ver fichero

1354
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
1354
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
1355
 	collator, _ := c.GetInt64("collator", 0)
1355
 	collator, _ := c.GetInt64("collator", 0)
1356
 	employee_number := c.GetString("employee_number")
1356
 	employee_number := c.GetString("employee_number")
1357
+	dialyzer_batch_number := c.GetString("dialyzer_batch_number")
1358
+	needle_batch_number := c.GetString("needle_batch_number")
1357
 	if id <= 0 {
1359
 	if id <= 0 {
1358
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
1360
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
1359
 		return
1361
 		return
1424
 		UpdatedTime:                time.Now().Unix(),
1426
 		UpdatedTime:                time.Now().Unix(),
1425
 		CheckDate:                  recordDate.Unix(),
1427
 		CheckDate:                  recordDate.Unix(),
1426
 		EmployeeNumber:             employee_number,
1428
 		EmployeeNumber:             employee_number,
1429
+		DialyzerBatchNumber:        dialyzer_batch_number,
1430
+		NeedleBatchNumber:          needle_batch_number,
1427
 	}
1431
 	}
1428
 
1432
 
1429
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
1433
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
1461
 		doubleCheck.CreatedTime = check.CreatedTime
1465
 		doubleCheck.CreatedTime = check.CreatedTime
1462
 		doubleCheck.UpdatedTime = time.Now().Unix()
1466
 		doubleCheck.UpdatedTime = time.Now().Unix()
1463
 		doubleCheck.ID = check.ID
1467
 		doubleCheck.ID = check.ID
1468
+
1464
 		redis := service.RedisClient()
1469
 		redis := service.RedisClient()
1465
 		err := service.UpdateDoubleCheck(&doubleCheck)
1470
 		err := service.UpdateDoubleCheck(&doubleCheck)
1466
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"
1471
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"

+ 1 - 1
controllers/his_api_controller.go Ver fichero

1475
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
1475
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
1476
 														return
1476
 														return
1477
 													}
1477
 													}
1478
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
1478
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
1479
 														// 查询该药品最后一次出库记录
1479
 														// 查询该药品最后一次出库记录
1480
 														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
1480
 														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
1481
 
1481
 

+ 6 - 1
controllers/mobile_api_controllers/dialysis_api_controller.go Ver fichero

744
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
744
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
745
 	collator, _ := c.GetInt64("collator", 0)
745
 	collator, _ := c.GetInt64("collator", 0)
746
 	employee_number := c.GetString("employee_number")
746
 	employee_number := c.GetString("employee_number")
747
-
747
+	dialyzer_batch_number := c.GetString("dialyzer_batch_number")
748
+	needle_batch_number := c.GetString("needle_batch_number")
748
 	if id <= 0 {
749
 	if id <= 0 {
749
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
750
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
750
 		return
751
 		return
828
 		CheckDate:                  recordDate.Unix(),
829
 		CheckDate:                  recordDate.Unix(),
829
 		UpdatedTime:                time.Now().Unix(),
830
 		UpdatedTime:                time.Now().Unix(),
830
 		EmployeeNumber:             employee_number,
831
 		EmployeeNumber:             employee_number,
832
+		DialyzerBatchNumber:        dialyzer_batch_number,
833
+		NeedleBatchNumber:          needle_batch_number,
831
 	}
834
 	}
832
 
835
 
833
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
836
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
885
 		doubleCheck.CreatedTime = check.CreatedTime
888
 		doubleCheck.CreatedTime = check.CreatedTime
886
 		doubleCheck.ID = check.ID
889
 		doubleCheck.ID = check.ID
887
 		doubleCheck.EmployeeNumber = employee_number
890
 		doubleCheck.EmployeeNumber = employee_number
891
+		doubleCheck.NeedleBatchNumber = needle_batch_number
892
+		doubleCheck.DialyzerBatchNumber = dialyzer_batch_number
888
 		err := service.UpdateDoubleCheck(&doubleCheck)
893
 		err := service.UpdateDoubleCheck(&doubleCheck)
889
 		//针对长沙南雅
894
 		//针对长沙南雅
890
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
895
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {

+ 2 - 0
models/dialysis.go Ver fichero

549
 	CheckTime                  int64  `gorm:"column:check_time" json:"check_time"`
549
 	CheckTime                  int64  `gorm:"column:check_time" json:"check_time"`
550
 	FirstCheckTime             int64  `gorm:"column:first_check_time" json:"first_check_time"`
550
 	FirstCheckTime             int64  `gorm:"column:first_check_time" json:"first_check_time"`
551
 	EmployeeNumber             string `gorm:"column:employee_number" json:"employee_number" form:"employee_number"`
551
 	EmployeeNumber             string `gorm:"column:employee_number" json:"employee_number" form:"employee_number"`
552
+	DialyzerBatchNumber        string `gorm:"column:dialyzer_batch_number" json:"dialyzer_batch_number" form:"dialyzer_batch_number"`
553
+	NeedleBatchNumber          string `gorm:"column:needle_batch_number" json:"needle_batch_number" form:"needle_batch_number"`
552
 }
554
 }
553
 
555
 
554
 func (DoubleCheck) TableName() string {
556
 func (DoubleCheck) TableName() string {

+ 1 - 1
service/dialysis_service.go Ver fichero

1593
 	advice_list_str, _ := redis.Get(key).Result()
1593
 	advice_list_str, _ := redis.Get(key).Result()
1594
 
1594
 
1595
 	if len(advice_list_str) == 0 { //没有到缓存数据,从数据库中获取数据,进行缓存到redis
1595
 	if len(advice_list_str) == 0 { //没有到缓存数据,从数据库中获取数据,进行缓存到redis
1596
-		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? and id desc ", orgID, scheduleDate).Find(&advices).Error
1596
+		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ?", orgID, scheduleDate).Find(&advices).Error
1597
 		if err != nil {
1597
 		if err != nil {
1598
 			if err == gorm.ErrRecordNotFound {
1598
 			if err == gorm.ErrRecordNotFound {
1599
 				if len(advices) <= 0 {
1599
 				if len(advices) <= 0 {

+ 7 - 1
service/mobile_dialysis_service.go Ver fichero

4357
 func UpdateStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
4357
 func UpdateStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
4358
 
4358
 
4359
 	prepare := models.DialysisBeforePrepare{}
4359
 	prepare := models.DialysisBeforePrepare{}
4360
+	var err error
4361
+	if count > 0 {
4362
+		err = XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
4363
+	}
4364
+	if count <= 0 {
4365
+		err = XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count, "status": 0}).Error
4366
+	}
4360
 
4367
 
4361
-	err := XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
4362
 	return err
4368
 	return err
4363
 }
4369
 }
4364
 
4370
 

+ 7 - 4
service/new_warehouse_service.go Ver fichero

1497
 			cancel_count += item.Count
1497
 			cancel_count += item.Count
1498
 		}
1498
 		}
1499
 
1499
 
1500
-		fmt.Println("deliver_number", deliver_number)
1501
-		fmt.Println("out_count", out_count)
1502
-		fmt.Println("cancel_count", cancel_count)
1500
+		//fmt.Println("deliver_number", deliver_number)
1501
+		//fmt.Println("out_count", out_count)
1502
+		//fmt.Println("cancel_count", cancel_count)
1503
+		//
1504
+		//fmt.Println("出库数据", deliver_number)
1505
+		//fmt.Println("出库流水---------------------", out_count, cancel_count)
1503
 		//如果本次出库数据大于历史出库数据 新增1条流水
1506
 		//如果本次出库数据大于历史出库数据 新增1条流水
1504
-		if deliver_number > (out_count - cancel_count) {
1507
+		if deliver_number >= (out_count - cancel_count) {
1505
 			drugflow := models.DrugFlow{
1508
 			drugflow := models.DrugFlow{
1506
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
1509
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
1507
 				WarehouseOutId:          warehouseout.ID,
1510
 				WarehouseOutId:          warehouseout.ID,