Merge remote-tracking branch 'origin/20230223_xt_api_new_branch' into 20230223_xt_api_new_branch

controllers/his_api_controller.go

@@ -1762,7 +1762,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 			if index >= 0 && index < len(sch_prescriptions) {
 				one, _ := service.GetGoodInformationByGoodId(pre.DialysisDialyszersId)
 				two, _ := service.GetGoodInformationByGoodId(pre.DialysisIrrigationId)
-				three, _ := service.GetGoodInformationByGoodId(pre.DialysisStrainerId)
+				//three, _ := service.GetGoodInformationByGoodId(pre.DialysisStrainerId)
 				if one.ID > 0 {
 					var hpt models.HisPrescriptionProjectTemplate
 					hpt.Type = 3
@@ -1805,27 +1805,27 @@ func (c *HisApiController) GetHisPatientInfo() {
 					hpt.GoodInfo = two
 					sch_prescriptions[index].HisPrescriptionProjectTemplate = append(sch_prescriptions[index].HisPrescriptionProjectTemplate, &hpt)
 				}
-				if three.ID > 0 {
-					var hpt models.HisPrescriptionProjectTemplate
-					hpt.Type = 3
-					hpt.ID = 0
-					hpt.PatientId = sch_prescriptions[index].PatientId
-					hpt.Status = 1
-					hpt.UserOrgId = sch_prescriptions[index].UserOrgId
-					hpt.Mtime = time.Now().Unix()
-					hpt.Ctime = time.Now().Unix()
-					hpt.RecordDate = sch_prescriptions[index].RecordDate
-					hpt.Count = "1"
-					hpt.Price = three.RetailPrice
-					hpt.ProjectId = three.ID
-					hpt.FeedetlSn = ""
-					hpt.PrescriptionId = sch_prescriptions[index].ID
-					hpt.Unit = three.PackingUnit
-					hpt.Day = "1"
-					hpt.SingleDose = "1"
-					hpt.GoodInfo = three
-					sch_prescriptions[index].HisPrescriptionProjectTemplate = append(sch_prescriptions[index].HisPrescriptionProjectTemplate, &hpt)
-				}
+				//if three.ID > 0 {
+				//	var hpt models.HisPrescriptionProjectTemplate
+				//	hpt.Type = 3
+				//	hpt.ID = 0
+				//	hpt.PatientId = sch_prescriptions[index].PatientId
+				//	hpt.Status = 1
+				//	hpt.UserOrgId = sch_prescriptions[index].UserOrgId
+				//	hpt.Mtime = time.Now().Unix()
+				//	hpt.Ctime = time.Now().Unix()
+				//	hpt.RecordDate = sch_prescriptions[index].RecordDate
+				//	hpt.Count = "1"
+				//	hpt.Price = three.RetailPrice
+				//	hpt.ProjectId = three.ID
+				//	hpt.FeedetlSn = ""
+				//	hpt.PrescriptionId = sch_prescriptions[index].ID
+				//	hpt.Unit = three.PackingUnit
+				//	hpt.Day = "1"
+				//	hpt.SingleDose = "1"
+				//	hpt.GoodInfo = three
+				//	sch_prescriptions[index].HisPrescriptionProjectTemplate = append(sch_prescriptions[index].HisPrescriptionProjectTemplate, &hpt)
+				//}
 
 				fmt.Println(sch_prescriptions)
 			}
@@ -1840,7 +1840,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 				if index >= 0 && index < len(last_prescriptions) {
 					one, _ := service.GetGoodInformationByGoodId(pre.DialysisDialyszersId)
 					two, _ := service.GetGoodInformationByGoodId(pre.DialysisIrrigationId)
-					three, _ := service.GetGoodInformationByGoodId(pre.DialysisStrainerId)
+					//three, _ := service.GetGoodInformationByGoodId(pre.DialysisStrainerId)
 					if one.ID > 0 {
 						var hpt models.HisPrescriptionProject
 						hpt.Type = 3
@@ -1884,27 +1884,27 @@ func (c *HisApiController) GetHisPatientInfo() {
 						hpt.GoodInfo = two
 						last_prescriptions[index].HisPrescriptionProject = append(last_prescriptions[index].HisPrescriptionProject, &hpt)
 					}
-					if three.ID > 0 {
-						var hpt models.HisPrescriptionProject
-						hpt.Type = 3
-						hpt.ID = 0
-						hpt.PatientId = last_prescriptions[index].PatientId
-						hpt.Status = 1
-						hpt.UserOrgId = last_prescriptions[index].UserOrgId
-						hpt.Mtime = time.Now().Unix()
-						hpt.Ctime = time.Now().Unix()
-						hpt.RecordDate = last_prescriptions[index].RecordDate
-						hpt.Count = "1"
-						hpt.Price = three.RetailPrice
-						hpt.ProjectId = three.ID
-						hpt.FeedetlSn = ""
-						hpt.PrescriptionId = last_prescriptions[index].ID
-						hpt.Unit = three.PackingUnit
-						hpt.Day = "1"
-						hpt.SingleDose = "1"
-						hpt.GoodInfo = three
-						last_prescriptions[index].HisPrescriptionProject = append(last_prescriptions[index].HisPrescriptionProject, &hpt)
-					}
+					//if three.ID > 0 {
+					//	var hpt models.HisPrescriptionProject
+					//	hpt.Type = 3
+					//	hpt.ID = 0
+					//	hpt.PatientId = last_prescriptions[index].PatientId
+					//	hpt.Status = 1
+					//	hpt.UserOrgId = last_prescriptions[index].UserOrgId
+					//	hpt.Mtime = time.Now().Unix()
+					//	hpt.Ctime = time.Now().Unix()
+					//	hpt.RecordDate = last_prescriptions[index].RecordDate
+					//	hpt.Count = "1"
+					//	hpt.Price = three.RetailPrice
+					//	hpt.ProjectId = three.ID
+					//	hpt.FeedetlSn = ""
+					//	hpt.PrescriptionId = last_prescriptions[index].ID
+					//	hpt.Unit = three.PackingUnit
+					//	hpt.Day = "1"
+					//	hpt.SingleDose = "1"
+					//	hpt.GoodInfo = three
+					//	last_prescriptions[index].HisPrescriptionProject = append(last_prescriptions[index].HisPrescriptionProject, &hpt)
+					//}
 				}
 			}
 		}