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

controllers/his_api_controller.go

@@ -35,7 +35,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/hisprescription/list", &HisApiController{}, "get:GetHisPrescriptionList")
 	beego.Router("/api/hisprescription/info", &HisApiController{}, "get:GetHisPrescriptionInfo")
 	beego.Router("/api/hisprescription/create", &HisApiController{}, "post:CreateHisPrescription")
-	beego.Router("/api/hisprescription/edit", &HisApiController{}, "post:EditHisPrescription")
+	//beego.Router("/api/hisprescription/edit", &HisApiController{}, "post:EditHisPrescription")
 	beego.Router("/api/doctorworkstation/casehistory/list", &HisApiController{}, "get:GetHisPatientCaseHistoryList")
 	beego.Router("/api/doctorworkstation/casehistory/get", &HisApiController{}, "get:GetHisPatientCaseHistory")
 	beego.Router("/api/doctorworkstation/casehistory/create", &HisApiController{}, "get:CreateHisPatientCaseHistory")
@@ -3091,6 +3091,17 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
+	// 开始主事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3098,6 +3109,16 @@ func (c *HisApiController) CreateHisPrescription() {
 
 		if len(prescriptions) > 0 {
 			for _, item := range prescriptions {
+				// 开始外部循环的事务
+				tx := db.Begin()
+
+				// 在函数结束时处理事务回滚
+				defer func() {
+					if r := recover(); r != nil {
+						tx.Rollback()
+					}
+				}()
+
 				items := item.(map[string]interface{})
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
@@ -3168,7 +3189,7 @@ func (c *HisApiController) CreateHisPrescription() {
 						MedType:            med_type,
 					}
 					tempPrescription = prescription
-					service.SaveHisPrescription(tempPrescription)
+					service.SaveHisPrescription(tx, tempPrescription)
 					redis := service.RedisClient()
 					key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 					redis.Set(key, "", time.Second)
@@ -3187,7 +3208,7 @@ func (c *HisApiController) CreateHisPrescription() {
 					//tempPrescription.OrderStatus = order_status
 					tempPrescription.PreTime = pTime
 					tempPrescription.MedType = med_type
-					service.SaveHisPrescription(tempPrescription)
+					service.SaveHisPrescription(tx, tempPrescription)
 					redis := service.RedisClient()
 					key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 
@@ -3211,6 +3232,15 @@ func (c *HisApiController) CreateHisPrescription() {
 					mtime := ctime
 					if len(advices) > 0 {
 						for _, advice := range advices {
+							tx := db.Begin()
+
+							// 在函数结束时处理事务回滚
+							defer func() {
+								if r := recover(); r != nil {
+									tx.Rollback()
+								}
+							}()
+
 							var s models.HisDoctorAdviceInfo
 							s.PrescriptionId = tempPrescription.ID
 							s.AdviceType = 2
@@ -3264,7 +3294,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 							}
 
-							service.CreateHisDoctorAdvice(&s)
+							service.CreateHisDoctorAdvice(&s, tx)
 
 							//记录日志
 							byterequest, _ := json.Marshal(s)
@@ -3298,7 +3328,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							tempTime := time.Unix(timestamp, 0)
 							timeFormat := tempTime.Format("20060102150405")
 							s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
-							service.CreateHisDoctorAdvice(&s)
+							service.CreateHisDoctorAdvice(&s, tx)
 							keySix := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 							redis.Set(keySix, "", time.Second)
 							keyFive := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
@@ -3315,6 +3345,14 @@ func (c *HisApiController) CreateHisPrescription() {
 					projects := items["project"].([]interface{})
 					if len(projects) > 0 {
 						for _, project := range projects {
+							tx := db.Begin()
+
+							// 在函数结束时处理事务回滚
+							defer func() {
+								if r := recover(); r != nil {
+									tx.Rollback()
+								}
+							}()
 
 							var p models.HisPrescriptionProject
 							p.PrescriptionId = tempPrescription.ID
@@ -3371,7 +3409,7 @@ func (c *HisApiController) CreateHisPrescription() {
 							//
 							//}
 
-							service.CreateHisProjectTwo(&p)
+							service.CreateHisProjectTwo(&p, tx)
 							//记录日志
 							byterequest, _ := json.Marshal(p)
 							adviceLog := models.XtDoctorAdviceLog{
@@ -3422,7 +3460,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												label.PProjectId = p.ID
 												label.ProjectName = team.ProjectTeam
 												label.PatientName = patient.Name
-												service.CreateHisLabelRecord(&label)
+												service.CreateHisLabelRecord(&label, tx)
 											}
 										} else { //单条检验检查项目
 											label.Number = tempPrescription.PrescriptionNumber
@@ -3440,13 +3478,13 @@ func (c *HisApiController) CreateHisPrescription() {
 											label.ItemId = p.TeamId
 											label.ProjectName = project.ProjectName
 											label.PatientName = patient.Name
-											service.CreateHisLabelRecord(&label)
+											service.CreateHisLabelRecord(&label, tx)
 										}
 									}
 								}
 							}
 
-							service.SaveHisProjectTwo(&p)
+							service.SaveHisProjectTwo(&p, tx)
 
 						}
 					}
@@ -3747,33 +3785,7 @@ func (c *HisApiController) CreateHisPrescription() {
 		}
 	}
 
-	//redisClient := service.RedisClient()
-	//defer redisClient.Close()
-	//
-	//list := models.HisList{
-	//  Patient_id:  patient_id,
-	//  Advice_id:0,
-	//  Record_date: 0,
-	//  Advice:      adviceList,
-	//  Project:     nil,
-	//}
-	//hisLis = append(hisLis, list)
-	//
-	//advice_json, _ := json.Marshal(&hisLis)
-	//redisClient.RPush("111", advice_json).Result()
-	//result, _ := redisClient.RPop("111").Result()
-	//fmt.Println("resuilt2332323323232323232323232322323233232",redisClient.LLen("111"))
-	//
-	//var dat []map[string]interface{}
-	//json.Unmarshal([]byte(result), &dat)
-	//fmt.Println("hhhh2332323232233223322332322323232323",dat)
-	//
-	//for k,v:=range dat{
-	//  fmt.Println("第",k,"个数的值是:",v,v["Advice"],v["Patient_id"])
-	//}
-	//project_json, _ := json.Marshal(&projectList)
-	//redisClient.LPush("222", project_json).Result()
-
+	tx.Commit()
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"msg": "保存成功",
@@ -3786,299 +3798,300 @@ func (c *HisApiController) CreateHisPrescription() {
 	}
 
 }
-func (c *HisApiController) EditHisPrescription() {
-	record_date := c.GetString("record_date")
-	patient_id, _ := c.GetInt64("patient_id")
-	reg_type, _ := c.GetInt64("reg_type")
-	//diagnose, _ := c.GetInt64("diagnose", 0)
-	diagnose := c.GetString("diagnose")
-	sick_type, _ := c.GetInt64("sick_type")
-	sick_history := c.GetString("sick_history")
-	doctor_id, _ := c.GetInt64("doctor", 0)
-	department, _ := c.GetInt64("department", 0)
-	his_patient_id, _ := c.GetInt64("his_patient_id")
-	p_type, _ := c.GetInt64("p_type")
-
-	dataBody := make(map[string]interface{}, 0)
-	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
 
-	timeLayout := "2006-01-02"
-	loc, _ := time.LoadLocation("Local")
-	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-	adminInfo := c.GetAdminUserInfo()
-	recordDateTime := theTime.Unix()
-
-	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor_id)
-
-	info, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
-	var hpInfo models.HisPrescriptionInfo
-	if info.ID == 0 {
-		var randNum int
-		randNum = rand.Intn(10000) + 1000
-		timestamp := time.Now().Unix()
-		tempTime := time.Unix(timestamp, 0)
-		timeFormat := tempTime.Format("20060102150405")
-		p_number := timeFormat + strconv.FormatInt(int64(randNum), 10) + strconv.FormatInt(int64(adminInfo.CurrentOrgId), 10) + strconv.FormatInt(int64(patient_id), 10)
-
-		hpInfo = models.HisPrescriptionInfo{
-			UserOrgId:          adminInfo.CurrentOrgId,
-			RecordDate:         theTime.Unix(),
-			PatientId:          patient_id,
-			Status:             1,
-			Ctime:              time.Now().Unix(),
-			Mtime:              time.Now().Unix(),
-			Creator:            adminInfo.AdminUser.Id,
-			Modifier:           adminInfo.AdminUser.Id,
-			Diagnosis:          diagnose,
-			SickHistory:        sick_history,
-			Departments:        department,
-			RegisterType:       reg_type,
-			PrescriptionNumber: p_number,
-			PrescriptionStatus: 1,
-			Doctor:             role.UserName,
-			DoctorId:           doctor_id,
-			SickType:           sick_type,
-			PType:              p_type,
-		}
-		service.SavePatientPrescriptionInfo(hpInfo)
-
-	} else {
-		hpInfo = models.HisPrescriptionInfo{
-			ID:                 info.ID,
-			UserOrgId:          adminInfo.CurrentOrgId,
-			RecordDate:         info.RecordDate,
-			PatientId:          info.PatientId,
-			Status:             1,
-			Ctime:              info.Ctime,
-			Mtime:              time.Now().Unix(),
-			Creator:            info.Creator,
-			Modifier:           adminInfo.AdminUser.Id,
-			Diagnosis:          diagnose,
-			SickHistory:        sick_history,
-			Departments:        department,
-			RegisterType:       reg_type,
-			PrescriptionNumber: info.PrescriptionNumber,
-			Doctor:             role.UserName,
-			PrescriptionStatus: info.PrescriptionStatus,
-			DoctorId:           doctor_id,
-			SickType:           sick_type,
-			PType:              info.PType,
-		}
-		service.SavePatientPrescriptionInfo(hpInfo)
-	}
-
-	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-		prescriptions, _ := dataBody["prescriptions"].([]interface{})
-
-		if len(prescriptions) > 0 {
-			for _, item := range prescriptions {
-				items := item.(map[string]interface{})
-				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
-					utils.ErrorLog("id")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				id := int64(items["id"].(float64))
-
-				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
-					utils.ErrorLog("type")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				types := int64(items["type"].(float64))
-
-				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
-					utils.ErrorLog("med_type")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				med_type := strconv.Itoa(int(items["med_type"].(float64)))
-
-				historyPrescription, _ := service.GetHisPrescriptionByID(adminInfo.CurrentOrgId, id)
-
-				ctime := time.Now().Unix()
-
-				prescription := &models.HisPrescription{
-					ID:                 id,
-					PatientId:          patient_id,
-					UserOrgId:          adminInfo.CurrentOrgId,
-					RecordDate:         recordDateTime,
-					Ctime:              ctime,
-					Mtime:              ctime,
-					Type:               types,
-					Modifier:           adminInfo.AdminUser.Id,
-					Creator:            adminInfo.AdminUser.Id,
-					Status:             1,
-					Doctor:             role.UserName,
-					HisPatientId:       his_patient_id,
-					OrderStatus:        1,
-					BatchNumber:        "",
-					PrescriptionNumber: hpInfo.PrescriptionNumber,
-					PType:              hpInfo.PType,
-					MedType:            med_type,
-				}
-
-				if historyPrescription.ID > 0 {
-					prescription.PreTime = historyPrescription.PreTime
-
-				}
-
-				service.SaveHisPrescription(prescription)
-
-				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-					advices := items["advices"].([]interface{})
-					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
-					groupNo := int64(0)
-					ctime := time.Now().Unix()
-					mtime := ctime
-					if len(advices) > 0 {
-						for _, advice := range advices {
-							var s models.HisDoctorAdviceInfo
-							s.PrescriptionId = prescription.ID
-							s.AdviceType = 2
-							s.AdviceDoctor = adminInfo.AdminUser.Id
-							s.StopState = 2
-							s.ExecutionState = 2
-							s.AdviceDate = recordDateTime
-							s.Status = 1
-							s.UserOrgId = adminInfo.CurrentOrgId
-							s.RecordDate = recordDateTime
-							s.StartTime = prescription.PreTime
-							s.Groupno = groupNo
-							s.CreatedTime = ctime
-							s.UpdatedTime = mtime
-							s.PatientId = patient_id
-							s.HisPatientId = his_patient_id
-							errcode := c.setAdviceWithJSONTwo(&s, advice.(map[string]interface{}))
-							if errcode > 0 {
-								c.ServeFailJSONWithSGJErrorCode(errcode)
-								return
-							}
-
-							if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
-								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
-								lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
-								if s.Price == 0 {
-									s.Price = lastWarehouse.RetailPrice
-								}
-							}
-
-							service.CreateHisDoctorAdvice(&s)
-							//记录日志
-							byterequest, _ := json.Marshal(s)
-							adviceLog := models.XtDoctorAdviceLog{
-								UserOrgId:   s.UserOrgId,
-								PatientId:   s.PatientId,
-								AdminUserId: adminInfo.AdminUser.Id,
-								Module:      1,
-								ErrLog:      string(byterequest),
-								Status:      1,
-								Ctime:       time.Now().Unix(),
-								Mtime:       0,
-								Source:      "电脑端his医嘱修改",
-								RecordDate:  s.AdviceDate,
-							}
-							service.CreateDoctorAdviceLog(adviceLog)
-							redis := service.RedisClient()
-							key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
-							redis.Set(key, "", time.Second)
-							keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
-							fmt.Println("keyOne", keyOne)
-							redis.Set(keyOne, "", time.Second)
-							keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
-							redis.Set(keySeven, "", time.Second)
-							redis.Close()
-
-						}
-					}
-				}
-				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
-					projects := items["project"].([]interface{})
-					if len(projects) > 0 {
-						for _, project := range projects {
-							var p models.HisPrescriptionProject
-							p.PrescriptionId = prescription.ID
-							p.Ctime = time.Now().Unix()
-							p.Mtime = time.Now().Unix()
-							p.PatientId = patient_id
-							p.RecordDate = recordDateTime
-							p.UserOrgId = adminInfo.CurrentOrgId
-							p.HisPatientId = his_patient_id
-							p.Status = 1
-							errcode := c.setProjectWithJSONTwo(&p, project.(map[string]interface{}))
-							if errcode > 0 {
-								c.ServeFailJSONWithSGJErrorCode(errcode)
-								return
-							}
-							service.CreateHisProjectTwo(&p)
-
-							//记录日志
-							byterequest, _ := json.Marshal(p)
-							adviceLog := models.XtDoctorAdviceLog{
-								UserOrgId:   p.UserOrgId,
-								PatientId:   p.PatientId,
-								AdminUserId: adminInfo.AdminUser.Id,
-								Module:      1,
-								ErrLog:      string(byterequest),
-								Status:      1,
-								Ctime:       time.Now().Unix(),
-								Mtime:       0,
-								Source:      "电脑端his项目修改",
-								RecordDate:  p.RecordDate,
-							}
-							service.CreateDoctorAdviceLog(adviceLog)
-						}
-					}
-				}
-				if items["addition"] != nil && reflect.TypeOf(items["addition"]).String() == "[]interface {}" {
-					addition := items["addition"].([]interface{})
-					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
-					ctime := time.Now().Unix()
-					mtime := ctime
-					if len(addition) > 0 {
-						for _, item := range addition {
-							var s models.HisAdditionalCharge
-							s.PrescriptionId = prescription.ID
-							s.Status = 1
-							s.UserOrgId = adminInfo.CurrentOrgId
-							s.RecordDate = recordDateTime
-							s.CreatedTime = ctime
-							s.UpdatedTime = mtime
-							s.PatientId = patient_id
-							s.HisPatientId = his_patient_id
-							errcode := c.setAddtionWithJSONTwo(&s, item.(map[string]interface{}), adminInfo.CurrentOrgId)
-							if errcode > 0 {
-								c.ServeFailJSONWithSGJErrorCode(errcode)
-								return
-							}
-							service.CreateAdditionalCharge(&s)
-						}
-					}
-				}
-
-			}
-		}
-	}
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "保存成功",
-		})
-		return
-
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
-	}
-}
+//func (c *HisApiController) EditHisPrescription() {
+//	record_date := c.GetString("record_date")
+//	patient_id, _ := c.GetInt64("patient_id")
+//	reg_type, _ := c.GetInt64("reg_type")
+//	//diagnose, _ := c.GetInt64("diagnose", 0)
+//	diagnose := c.GetString("diagnose")
+//	sick_type, _ := c.GetInt64("sick_type")
+//	sick_history := c.GetString("sick_history")
+//	doctor_id, _ := c.GetInt64("doctor", 0)
+//	department, _ := c.GetInt64("department", 0)
+//	his_patient_id, _ := c.GetInt64("his_patient_id")
+//	p_type, _ := c.GetInt64("p_type")
+//
+//	dataBody := make(map[string]interface{}, 0)
+//	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+//	if err != nil {
+//		utils.ErrorLog(err.Error())
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//		return
+//	}
+//
+//	timeLayout := "2006-01-02"
+//	loc, _ := time.LoadLocation("Local")
+//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+//	if err != nil {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//		return
+//	}
+//	adminInfo := c.GetAdminUserInfo()
+//	recordDateTime := theTime.Unix()
+//
+//	role, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor_id)
+//
+//	info, _ := service.FindPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
+//	var hpInfo models.HisPrescriptionInfo
+//	if info.ID == 0 {
+//		var randNum int
+//		randNum = rand.Intn(10000) + 1000
+//		timestamp := time.Now().Unix()
+//		tempTime := time.Unix(timestamp, 0)
+//		timeFormat := tempTime.Format("20060102150405")
+//		p_number := timeFormat + strconv.FormatInt(int64(randNum), 10) + strconv.FormatInt(int64(adminInfo.CurrentOrgId), 10) + strconv.FormatInt(int64(patient_id), 10)
+//
+//		hpInfo = models.HisPrescriptionInfo{
+//			UserOrgId:          adminInfo.CurrentOrgId,
+//			RecordDate:         theTime.Unix(),
+//			PatientId:          patient_id,
+//			Status:             1,
+//			Ctime:              time.Now().Unix(),
+//			Mtime:              time.Now().Unix(),
+//			Creator:            adminInfo.AdminUser.Id,
+//			Modifier:           adminInfo.AdminUser.Id,
+//			Diagnosis:          diagnose,
+//			SickHistory:        sick_history,
+//			Departments:        department,
+//			RegisterType:       reg_type,
+//			PrescriptionNumber: p_number,
+//			PrescriptionStatus: 1,
+//			Doctor:             role.UserName,
+//			DoctorId:           doctor_id,
+//			SickType:           sick_type,
+//			PType:              p_type,
+//		}
+//		service.SavePatientPrescriptionInfo(hpInfo)
+//
+//	} else {
+//		hpInfo = models.HisPrescriptionInfo{
+//			ID:                 info.ID,
+//			UserOrgId:          adminInfo.CurrentOrgId,
+//			RecordDate:         info.RecordDate,
+//			PatientId:          info.PatientId,
+//			Status:             1,
+//			Ctime:              info.Ctime,
+//			Mtime:              time.Now().Unix(),
+//			Creator:            info.Creator,
+//			Modifier:           adminInfo.AdminUser.Id,
+//			Diagnosis:          diagnose,
+//			SickHistory:        sick_history,
+//			Departments:        department,
+//			RegisterType:       reg_type,
+//			PrescriptionNumber: info.PrescriptionNumber,
+//			Doctor:             role.UserName,
+//			PrescriptionStatus: info.PrescriptionStatus,
+//			DoctorId:           doctor_id,
+//			SickType:           sick_type,
+//			PType:              info.PType,
+//		}
+//		service.SavePatientPrescriptionInfo(hpInfo)
+//	}
+//
+//	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+//		prescriptions, _ := dataBody["prescriptions"].([]interface{})
+//
+//		if len(prescriptions) > 0 {
+//			for _, item := range prescriptions {
+//				items := item.(map[string]interface{})
+//				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+//					utils.ErrorLog("id")
+//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//					return
+//				}
+//				id := int64(items["id"].(float64))
+//
+//				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+//					utils.ErrorLog("type")
+//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//					return
+//				}
+//				types := int64(items["type"].(float64))
+//
+//				if items["med_type"] == nil || reflect.TypeOf(items["med_type"]).String() != "float64" {
+//					utils.ErrorLog("med_type")
+//					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+//					return
+//				}
+//				med_type := strconv.Itoa(int(items["med_type"].(float64)))
+//
+//				historyPrescription, _ := service.GetHisPrescriptionByID(adminInfo.CurrentOrgId, id)
+//
+//				ctime := time.Now().Unix()
+//
+//				prescription := &models.HisPrescription{
+//					ID:                 id,
+//					PatientId:          patient_id,
+//					UserOrgId:          adminInfo.CurrentOrgId,
+//					RecordDate:         recordDateTime,
+//					Ctime:              ctime,
+//					Mtime:              ctime,
+//					Type:               types,
+//					Modifier:           adminInfo.AdminUser.Id,
+//					Creator:            adminInfo.AdminUser.Id,
+//					Status:             1,
+//					Doctor:             role.UserName,
+//					HisPatientId:       his_patient_id,
+//					OrderStatus:        1,
+//					BatchNumber:        "",
+//					PrescriptionNumber: hpInfo.PrescriptionNumber,
+//					PType:              hpInfo.PType,
+//					MedType:            med_type,
+//				}
+//
+//				if historyPrescription.ID > 0 {
+//					prescription.PreTime = historyPrescription.PreTime
+//
+//				}
+//
+//				service.SaveHisPrescription(prescription)
+//
+//				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+//					advices := items["advices"].([]interface{})
+//					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+//					groupNo := int64(0)
+//					ctime := time.Now().Unix()
+//					mtime := ctime
+//					if len(advices) > 0 {
+//						for _, advice := range advices {
+//							var s models.HisDoctorAdviceInfo
+//							s.PrescriptionId = prescription.ID
+//							s.AdviceType = 2
+//							s.AdviceDoctor = adminInfo.AdminUser.Id
+//							s.StopState = 2
+//							s.ExecutionState = 2
+//							s.AdviceDate = recordDateTime
+//							s.Status = 1
+//							s.UserOrgId = adminInfo.CurrentOrgId
+//							s.RecordDate = recordDateTime
+//							s.StartTime = prescription.PreTime
+//							s.Groupno = groupNo
+//							s.CreatedTime = ctime
+//							s.UpdatedTime = mtime
+//							s.PatientId = patient_id
+//							s.HisPatientId = his_patient_id
+//							errcode := c.setAdviceWithJSONTwo(&s, advice.(map[string]interface{}))
+//							if errcode > 0 {
+//								c.ServeFailJSONWithSGJErrorCode(errcode)
+//								return
+//							}
+//
+//							if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
+//								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+//								lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
+//								if s.Price == 0 {
+//									s.Price = lastWarehouse.RetailPrice
+//								}
+//							}
+//
+//							service.CreateHisDoctorAdvice(&s)
+//							//记录日志
+//							byterequest, _ := json.Marshal(s)
+//							adviceLog := models.XtDoctorAdviceLog{
+//								UserOrgId:   s.UserOrgId,
+//								PatientId:   s.PatientId,
+//								AdminUserId: adminInfo.AdminUser.Id,
+//								Module:      1,
+//								ErrLog:      string(byterequest),
+//								Status:      1,
+//								Ctime:       time.Now().Unix(),
+//								Mtime:       0,
+//								Source:      "电脑端his医嘱修改",
+//								RecordDate:  s.AdviceDate,
+//							}
+//							service.CreateDoctorAdviceLog(adviceLog)
+//							redis := service.RedisClient()
+//							key := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
+//							redis.Set(key, "", time.Second)
+//							keyOne := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient_id, 10) + ":" + strconv.FormatInt(recordDateTime, 10) + ":his_doctor_advice"
+//							fmt.Println("keyOne", keyOne)
+//							redis.Set(keyOne, "", time.Second)
+//							keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
+//							redis.Set(keySeven, "", time.Second)
+//							redis.Close()
+//
+//						}
+//					}
+//				}
+//				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+//					projects := items["project"].([]interface{})
+//					if len(projects) > 0 {
+//						for _, project := range projects {
+//							var p models.HisPrescriptionProject
+//							p.PrescriptionId = prescription.ID
+//							p.Ctime = time.Now().Unix()
+//							p.Mtime = time.Now().Unix()
+//							p.PatientId = patient_id
+//							p.RecordDate = recordDateTime
+//							p.UserOrgId = adminInfo.CurrentOrgId
+//							p.HisPatientId = his_patient_id
+//							p.Status = 1
+//							errcode := c.setProjectWithJSONTwo(&p, project.(map[string]interface{}))
+//							if errcode > 0 {
+//								c.ServeFailJSONWithSGJErrorCode(errcode)
+//								return
+//							}
+//							service.CreateHisProjectTwo(&p)
+//
+//							//记录日志
+//							byterequest, _ := json.Marshal(p)
+//							adviceLog := models.XtDoctorAdviceLog{
+//								UserOrgId:   p.UserOrgId,
+//								PatientId:   p.PatientId,
+//								AdminUserId: adminInfo.AdminUser.Id,
+//								Module:      1,
+//								ErrLog:      string(byterequest),
+//								Status:      1,
+//								Ctime:       time.Now().Unix(),
+//								Mtime:       0,
+//								Source:      "电脑端his项目修改",
+//								RecordDate:  p.RecordDate,
+//							}
+//							service.CreateDoctorAdviceLog(adviceLog)
+//						}
+//					}
+//				}
+//				if items["addition"] != nil && reflect.TypeOf(items["addition"]).String() == "[]interface {}" {
+//					addition := items["addition"].([]interface{})
+//					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+//					ctime := time.Now().Unix()
+//					mtime := ctime
+//					if len(addition) > 0 {
+//						for _, item := range addition {
+//							var s models.HisAdditionalCharge
+//							s.PrescriptionId = prescription.ID
+//							s.Status = 1
+//							s.UserOrgId = adminInfo.CurrentOrgId
+//							s.RecordDate = recordDateTime
+//							s.CreatedTime = ctime
+//							s.UpdatedTime = mtime
+//							s.PatientId = patient_id
+//							s.HisPatientId = his_patient_id
+//							errcode := c.setAddtionWithJSONTwo(&s, item.(map[string]interface{}), adminInfo.CurrentOrgId)
+//							if errcode > 0 {
+//								c.ServeFailJSONWithSGJErrorCode(errcode)
+//								return
+//							}
+//							service.CreateAdditionalCharge(&s)
+//						}
+//					}
+//				}
+//
+//			}
+//		}
+//	}
+//	if err == nil {
+//		c.ServeSuccessJSON(map[string]interface{}{
+//			"msg": "保存成功",
+//		})
+//		return
+//
+//	} else {
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+//		return
+//	}
+//}
 
 func (c *HisApiController) DeletePrescription() {
 	prescription_id, _ := c.GetInt64("id")
@@ -4809,7 +4822,7 @@ func (c *HisApiController) DeleteProject() {
 	service.DeletePrintInfo(id)
 	label, _ := service.GetProjectById(adminInfo.CurrentOrgId, id, project.RecordDate, project.PatientId)
 	label.Status = 0
-	service.CreateHisLabelRecord(&label)
+	service.CreateHisLabelRecordTwo(&label)
 
 	fmt.Println(goodOutConfig.IsOpen)
 	if goodOutConfig.IsOpen != 1 {
@@ -11280,7 +11293,7 @@ func (this *HisApiController) ChangeMedType() {
 		id, _ := strconv.ParseInt(ids_arr[0], 10, 64)
 		prescription, _ := service.GetPrescriptionById(id, this.GetAdminUserInfo().CurrentOrgId)
 		prescription.MedType = med_type
-		err := service.SaveHisPrescription(&prescription)
+		err := service.SaveHisPrescriptionTwo(&prescription)
 
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{

service/his_print_service.go

@@ -113,7 +113,7 @@ func GetBatchProjectHisPrescription(ids []string, record_time int64, user_org_id
 		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Joins("").Joins("Join xt_his_project p On p.id = his_prescription_project.project_id ").Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
+					return db.Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
 				})
 		}).
 		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).