提交代码

controllers/his_api_controller.go

@@ -1824,7 +1824,6 @@ func (c *HisApiController) CreateHisPrescription() {
 	edit, src := GetCompareData(dataBody)
 	drugResult := ComparePrescriptions(src.adviceList, edit.adviceList)
 	goodResult := CompareGoodPrescriptions(src.projectList, edit.projectList)
-
 	fmt.Println(drugResult)
 	fmt.Println(goodResult)
 
@@ -11849,18 +11848,18 @@ func (c *HisApiController) GetHisMonthChargePatientList() {
 
 // PrescriptionDifference 医嘱数量差值结构体
 type PrescriptionDrugDifference struct {
-	DrugID     int64
-	ID         int64
-	Difference float64
-	Unit       string
+	DrugID     int64   //基础库药品id
+	ID         int64   //医嘱id
+	Difference float64 //差值
+	Unit       string  //单位
 }
 
 type PrescriptionGoodDifference struct {
-	GoodID     int64
-	ID         int64
-	Difference int64
-	Unit       string
-	Type       int64
+	GoodID     int64  //基础库项目耗材id
+	ID         int64  //医嘱id
+	Difference int64  //差值
+	Unit       string //单位
+	Type       int64  //类型
 }
 
 type EditCustomData struct {
@@ -11935,7 +11934,7 @@ func GetCompareData(dataBody map[string]interface{}) (editCustomData EditCustomD
 
 	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["prescriptions"].([]interface{})
-		var tempPrescription *models.HisPrescription
+		//var tempPrescription *models.HisPrescriptionProjectscription
 		if len(prescriptions) > 0 {
 			for _, item := range prescriptions {
 				items := item.(map[string]interface{})
@@ -11949,12 +11948,10 @@ func GetCompareData(dataBody map[string]interface{}) (editCustomData EditCustomD
 					if len(advices) > 0 {
 						for _, advice := range advices {
 							var s models.HisDoctorAdviceInfo
-							s.PrescriptionId = tempPrescription.ID
 							s.AdviceType = 2
 							s.StopState = 2
 							s.ExecutionState = 2
 							s.Status = 1
-							s.StartTime = tempPrescription.PreTime
 							s.Groupno = groupNo
 							s.CreatedTime = ctime
 							s.UpdatedTime = mtime
@@ -11973,7 +11970,6 @@ func GetCompareData(dataBody map[string]interface{}) (editCustomData EditCustomD
 					if len(projects) > 0 {
 						for _, project := range projects {
 							var p models.HisPrescriptionProject
-							p.PrescriptionId = tempPrescription.ID
 							p.Ctime = time.Now().Unix()
 							p.Mtime = time.Now().Unix()
 							p.Status = 1
@@ -11993,7 +11989,7 @@ func GetCompareData(dataBody map[string]interface{}) (editCustomData EditCustomD
 	editCustomData.adviceList = adviceList
 
 	list, _ := service.GetBatchHisDoctorAdviceByIDs(advice_ids)
-	list2, _ := service.GetBatchHisProjectByIDs(advice_ids)
+	list2, _ := service.GetBatchHisProjectByIDs(project_ids)
 
 	srcCustomData.adviceList = list
 	srcCustomData.projectList = list2

service/his_service.go

@@ -2953,11 +2953,11 @@ func GetHisPrescriptionByHisPatientID(record_date int64, org_id int64, patient_i
 }
 
 func GetBatchHisDoctorAdviceByIDs(ids []int64) (list []*models.HisDoctorAdviceInfo, err error) {
-	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id in (?) and status = 1", ids).Where(&list).Error
+	err = readDb.Model(&models.HisDoctorAdviceInfo{}).Where("id in (?) and status = 1", ids).Find(&list).Error
 	return
 }
 
 func GetBatchHisProjectByIDs(ids []int64) (list []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Where("id in (?) and status = 1", ids).Where(&list).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Where("id in (?) and status = 1", ids).Find(&list).Error
 	return
 }