医嘱

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9531
-runmode = prod
+runmode = dev
 #dev/prod
 
 #

controllers/dialysis_api_controller.go

@@ -1354,6 +1354,8 @@ func (c *DialysisApiController) PostDouleCheck() {
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
 	collator, _ := c.GetInt64("collator", 0)
 	employee_number := c.GetString("employee_number")
+	dialyzer_batch_number := c.GetString("dialyzer_batch_number")
+	needle_batch_number := c.GetString("needle_batch_number")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1424,6 +1426,8 @@ func (c *DialysisApiController) PostDouleCheck() {
 		UpdatedTime:                time.Now().Unix(),
 		CheckDate:                  recordDate.Unix(),
 		EmployeeNumber:             employee_number,
+		DialyzerBatchNumber:        dialyzer_batch_number,
+		NeedleBatchNumber:          needle_batch_number,
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -1461,6 +1465,7 @@ func (c *DialysisApiController) PostDouleCheck() {
 		doubleCheck.CreatedTime = check.CreatedTime
 		doubleCheck.UpdatedTime = time.Now().Unix()
 		doubleCheck.ID = check.ID
+
 		redis := service.RedisClient()
 		err := service.UpdateDoubleCheck(&doubleCheck)
 		key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":double_check"

controllers/his_api_controller.go

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

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -744,7 +744,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 	pipeline_connection_desc := c.GetString("pipeline_connection_desc")
 	collator, _ := c.GetInt64("collator", 0)
 	employee_number := c.GetString("employee_number")
-
+	dialyzer_batch_number := c.GetString("dialyzer_batch_number")
+	needle_batch_number := c.GetString("needle_batch_number")
 	if id <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -828,6 +829,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		CheckDate:                  recordDate.Unix(),
 		UpdatedTime:                time.Now().Unix(),
 		EmployeeNumber:             employee_number,
+		DialyzerBatchNumber:        dialyzer_batch_number,
+		NeedleBatchNumber:          needle_batch_number,
 	}
 
 	_, check := service.FindDoubleCheckByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -885,6 +888,8 @@ func (c *DialysisAPIController) PostDoubleCheck() {
 		doubleCheck.CreatedTime = check.CreatedTime
 		doubleCheck.ID = check.ID
 		doubleCheck.EmployeeNumber = employee_number
+		doubleCheck.NeedleBatchNumber = needle_batch_number
+		doubleCheck.DialyzerBatchNumber = dialyzer_batch_number
 		err := service.UpdateDoubleCheck(&doubleCheck)
 		//针对长沙南雅
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {

models/dialysis.go

@@ -549,6 +549,8 @@ type DoubleCheck struct {
 	CheckTime                  int64  `gorm:"column:check_time" json:"check_time"`
 	FirstCheckTime             int64  `gorm:"column:first_check_time" json:"first_check_time"`
 	EmployeeNumber             string `gorm:"column:employee_number" json:"employee_number" form:"employee_number"`
+	DialyzerBatchNumber        string `gorm:"column:dialyzer_batch_number" json:"dialyzer_batch_number" form:"dialyzer_batch_number"`
+	NeedleBatchNumber          string `gorm:"column:needle_batch_number" json:"needle_batch_number" form:"needle_batch_number"`
 }
 
 func (DoubleCheck) TableName() string {

service/dialysis_service.go

@@ -1593,7 +1593,7 @@ func GetAllPcAdvicestByList(orgID int64, scheduleDate int64) (advices []*VMDocto
 	advice_list_str, _ := redis.Get(key).Result()
 
 	if len(advice_list_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? and id desc ", orgID, scheduleDate).Find(&advices).Error
+		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ?", orgID, scheduleDate).Find(&advices).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if len(advices) <= 0 {

service/mobile_dialysis_service.go

@@ -4357,8 +4357,14 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 func UpdateStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
 
 	prepare := models.DialysisBeforePrepare{}
+	var err error
+	if count > 0 {
+		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
+	}
+	if count <= 0 {
+		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
+	}
 
-	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
 	return err
 }
 

service/new_warehouse_service.go

@@ -1497,11 +1497,14 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
-		fmt.Println("deliver_number", deliver_number)
-		fmt.Println("out_count", out_count)
-		fmt.Println("cancel_count", cancel_count)
+		//fmt.Println("deliver_number", deliver_number)
+		//fmt.Println("out_count", out_count)
+		//fmt.Println("cancel_count", cancel_count)
+		//
+		//fmt.Println("出库数据", deliver_number)
+		//fmt.Println("出库流水---------------------", out_count, cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
-		if deliver_number > (out_count - cancel_count) {
+		if deliver_number >= (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
 				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 				WarehouseOutId:          warehouseout.ID,