库存流水展示

controllers/dialysis_api_controller.go

@@ -582,7 +582,7 @@ func (c *DialysisApiController) PostPrescription() {
 			if filedConfig.ID > 0 {
 				str = dialyzerPerfusionApparatus
 			} else {
-				str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+				str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 			}
 			service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 		}
@@ -858,7 +858,8 @@ func (c *DialysisApiController) PostSoulution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
+
 		}
 		service.ModifyScheduleMode(mode_id, patient, recordDate.Unix(), adminUserInfo.CurrentOrgId, str)
 	}

controllers/his_api_controller.go

@@ -2389,7 +2389,7 @@ func (c *HisApiController) CreateHisPrescription() {
 						//如果历史数和当前数据不想等才进行退库出库
 						if out_count != parseIntCount {
 							service.ConsumablePrescriptionDelivery(adminInfo.CurrentOrgId, item.PatientId, item.RecordDate, &dialyPrepareOne, &lastOut, creater, parseIntCount)
-							fmt.Println("9999999----------------------------------------")
+
 							service.UpdateAutomaticReduce(item.PatientId, item.RecordDate, item.ProjectId, item.ID)
 							detail := models.AutomaticReduceDetail{
 								WarehouseOutId:          0,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1490,7 +1490,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, id, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -3031,7 +3031,7 @@ func (c *DialysisAPIController) PostSolution() {
 		if filedConfig.ID > 0 {
 			str = dialyzerPerfusionApparatus
 		} else {
-			str = dialysis_dialyszers + "/" + dialysis_irrigation + "/" + dialysis_strainer
+			str = dialysis_dialyszers + "/" + dialysis_irrigation + " " + dialysis_strainer
 		}
 		service.ModifyScheduleMode(mode_id, patient.ID, recordDate.Unix(), adminUserInfo.Org.Id, str)
 	}
@@ -4573,6 +4573,7 @@ func (c *DialysisAPIController) CreateRemindDoctorAdvice() {
 	}
 
 	if len(advices) > 0 {
+
 		list, err := service.CreateMGroupAdvice(adminUserInfo.Org.Id, advices, groupNo)
 		key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(RecordDate, 10) + ":doctor_advices"
 		redis := service.RedisClient()

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3640,7 +3640,6 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		advice_date, _ := dataBody["advice_date"].(string)
-		fmt.Println("advice_date----------------------------------", advice_date)
 
 		var advicedateunix int64
 		if len(advice_date) > 0 {
@@ -3674,12 +3673,16 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		startTime, _ := dataBody["start_time"].(string)
+
 		if len(startTime) == 0 {
 			utils.ErrorLog("len(start_time) == 0")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
 		theTime, err = time.ParseInLocation(timeLayout+" 15:04:05", startTime, loc)
+
+		theTimeOne, _ := time.ParseInLocation("2006-01-02 15:04:05", startTime2+" 00:00:00", loc)
+
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3707,8 +3710,15 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.Remark = Remark
 			advice.AdviceType = adviceType
 			advice.StartTime = StartTime
-			advice.AdviceDate = AdviceDate
-			advice.RecordDate = RecordDate
+			if adminUserInfo.Org.Id == 10340 {
+				advice.AdviceDate = AdviceDate
+				advice.RecordDate = RecordDate
+			}
+			if adminUserInfo.Org.Id != 10340 {
+				advice.AdviceDate = theTimeOne.Unix()
+				advice.RecordDate = theTimeOne.Unix()
+			}
+
 			advice.Status = 1
 			advice.CreatedTime = time.Now().Unix()
 			advice.UpdatedTime = time.Now().Unix()

controllers/patient_api_controller.go

@@ -1470,6 +1470,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 					child.PatientId = patientInfo.ID
 					child.AdviceDoctor = adminUserInfo.AdminUser.Id
 					child.IsSettle = 2
+
 					if childMap["advice_name"] == nil || reflect.TypeOf(childMap["advice_name"]).String() != "string" {
 						utils.ErrorLog("child advice_name")
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1535,6 +1536,20 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 					child.DeliveryWay = advice.DeliveryWay
 					child.ExecutionFrequency = advice.ExecutionFrequency
+
+					if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 9671 {
+						if child.PrescribingNumber == 0 {
+							child.PrescribingNumber = 1
+						}
+						//查询该患者今日有没有双人核对
+						check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.CurrentOrgId, patientInfo.ID, child.AdviceDate)
+
+						if check.ID > 0 {
+							child.Checker = check.Modifier
+							child.CheckState = 1
+							child.CheckTime = time.Now().Unix()
+						}
+					}
 					advice.Children = append(advice.Children, &child)
 				}
 			}

routers/router.go

@@ -11,7 +11,7 @@ import (
 func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		//AllowAllOrigins:  true,
-		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
+		AllowOrigins: []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://localhost:9529", "http://localhost:9531", "http://xt.test.shengws.com", "http://new_mobile.test.sgjyun.com", "https://api.xt.test.sgjyun.com", "https://xt.test.shengws.com", "http://xt.test.sgjyun.com", "https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com", "https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com", "http://mobile.sgjyun.com", "http://mobile.kuyicloud.com"},
 		//AllowOrigins:     []string{"https://xt.kuyicloud.com", "http://localhost:9528", "http://xt.test.shengws.com","https://xt.test.shengws.com", "http://xt.test.sgjyun.com","https://xt.test.sgjyun.com", "http://localhost:8081", "http://localhost:8082", "https://pad.kuyicloud.com", "http://pad.kuyicloud.com", "http://pad.test.sgjyun.com","https://pad.test.sgjyun.com", "http://admin.xt.test.sgjyun.com", "http://admin.xt.kuyicloud.com","http://mobile.sgjyun.com","http://mobile.kuyicloud.com"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-XSRF-TOKEN", "Permission", "KyToken"},