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

@@ -72,9 +72,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/postprojectinformation", &HisApiController{}, "post:PostProjectInformation")
 	//beego.Router("/api/editprojectinformation", &HisApiController{}, "post:EditProjectInformation")
 	beego.Router("/api/hisprescriptiontemplate/create", &HisApiController{}, "post:CreateHisPrescriptionTemplate")
-
 	beego.Router("/api/privateexpenses/get", &HisApiController{}, "get:GetPrivateExpensesInfo")
-
 	beego.Router("/api/changemedtype/post", &HisApiController{}, "post:ChangeMedType")
 
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "post:RefudDetail")
@@ -106,69 +104,79 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/getfapiaonumber", &HisApiController{}, "get:GetFaPiaoNumber")
 
-	//beego.Router("/api/associationprescription", &HisApiController{}, "get:AssociationHisPrescription")
-	//beego.Router("/api/checkhispatient", &HisApiController{}, "get:CheckHisPatient")
+	beego.Router("/api/associationprescription", &HisApiController{}, "get:AssociationHisPrescription")
+	beego.Router("/api/checkhispatient", &HisApiController{}, "get:CheckHisPatient")
 
 }
 
-//func (c *HisApiController) CheckHisPatient() {
-//	record_date := c.GetString("record_date")
-//	patient_id, _ := c.GetInt64("patient_id")
-//
-//	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
-//	}
-//	recordDateTime := theTime.Unix()
-//	adminInfo := c.GetAdminUserInfo()
-//	patients, _ := service.GetHisPatientInfoTwo(adminInfo.CurrentOrgId, patient_id, recordDateTime)
-//	if len(patients) > 1 {
-//		ps, _ := service.GetHisPrescriptionByHisPatientID(recordDateTime, adminInfo.CurrentOrgId, patient_id)
-//		if len(ps) > 0 {
-//			c.ServeSuccessJSON(map[string]interface{}{
-//				"status": 1,
-//				"msg":    "关联",
-//				"ps":     ps,
-//			})
-//		} else {
-//			c.ServeSuccessJSON(map[string]interface{}{
-//				"status": 0,
-//				"msg":    "无需关联",
-//			})
-//		}
-//	} else {
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"status": 0,
-//			"msg":    "无需关联",
-//		})
-//		return
-//	}
-//}
-//func (c *HisApiController) AssociationHisPrescription() {
-//	record_date, _ := c.GetInt64("record_date")
-//	his_patient_id, _ := c.GetInt64("his_patient_id")
-//	patient_id, _ := c.GetInt64("patient_id")
-//	p_ids := c.GetString("p_ids")
-//	p_ids_arr := strings.Split(p_ids, ",")
-//	his_patient, _ := service.GetHisPatientByIdThree(his_patient_id)
-//	if his_patient_id == 0 || his_patient.ID == 0 {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-//		return
-//	}
-//	err := service.UpdateHisPrescriptionHisIDByPID(his_patient_id, patient_id, record_date, c.GetAdminUserInfo().CurrentOrgId, p_ids_arr)
-//	if err == nil {
-//		c.ServeSuccessJSON(map[string]interface{}{
-//			"msg": "关联处方成功",
-//		})
-//		return
-//	} else {
-//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-//		return
-//	}
-//}
+func (c *HisApiController) CheckHisPatient() {
+	record_date := c.GetString("record_date")
+	patient_id, _ := c.GetInt64("patient_id")
+
+	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
+	}
+	recordDateTime := theTime.Unix()
+	adminInfo := c.GetAdminUserInfo()
+	patients, _ := service.GetHisPatientInfoTwo(adminInfo.CurrentOrgId, patient_id, recordDateTime)
+	if len(patients) > 1 {
+		ps, _ := service.GetHisPrescriptionByHisPatientID(recordDateTime, adminInfo.CurrentOrgId, patient_id)
+		if len(ps) > 0 && len(ps[0].VMHisPrescription) > 0 {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status":         1,
+				"msg":            "关联",
+				"ps":             ps,
+				"his_patient_id": patients[len(patients)-1].ID,
+				"patient_id":     patients[len(patients)-1].PatientId,
+			})
+		} else {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"status": 0,
+				"msg":    "无需关联",
+			})
+		}
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"status": 0,
+			"msg":    "无需关联",
+		})
+		return
+	}
+}
+func (c *HisApiController) AssociationHisPrescription() {
+	record_date := c.GetString("record_date")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	patient_id, _ := c.GetInt64("patient_id")
+	p_ids := c.GetString("p_ids")
+	p_ids_arr := strings.Split(p_ids, ",")
+	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
+	}
+	recordDateTime := theTime.Unix()
+	his_patient, _ := service.GetHisPatientByIdThree(his_patient_id)
+	if his_patient_id == 0 || his_patient.ID == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	err = service.UpdateHisPrescriptionHisIDByPID(his_patient_id, patient_id, recordDateTime, c.GetAdminUserInfo().CurrentOrgId, p_ids_arr)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "关联处方成功",
+		})
+		return
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
 
 //func (c *HisApiController) AssociationHisPrescription() {
 //	record_date, _ := c.GetInt64("record_date")

service/his_service.go

@@ -944,7 +944,7 @@ func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int
 }
 
 func FindPatientPrescriptionInfoTen(org_id int64, patient_id int64, start_time int64, end_time int64, p_type int64) (info []models.HisPrescriptionInfo, err error) {
-	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date >= ? and record_date <= ? AND patient_id = ? AND p_type = ?", org_id, start_time, end_time, patient_id, p_type).First(&info).Error
+	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date >= ? and record_date <= ? AND patient_id = ? AND p_type = ?", org_id, start_time, end_time, patient_id, p_type).Find(&info).Error
 	return
 
 }