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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10495 //机构id
+		subscibe.OrgId = 10138 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10495 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17513 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10495 //机构id小英9675或4
+		subscibe.OrgId = 10138 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10495 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10138 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 17513 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -2536,6 +2536,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			}
 		}
 
+		if adminUserInfo.CurrentOrgId == 10644 {
+			assessmentBeforeDislysis.PunctureNeedle = ""
+		}
+
 		err := service.AddSigleAssessmentBeforeDislysisRecord(&assessmentBeforeDislysis)
 		//记录日志
 		byterequest, _ := json.Marshal(assessmentBeforeDislysis)

controllers/his_api_controller.go

@@ -1705,6 +1705,8 @@ func (c *HisApiController) GetHisPatientInfo() {
 	beforThrity, _ := service.GetAssessmentBeforThrity(admin.CurrentOrgId, patient_id, recordDateTime)
 
 	LastCaseHistory, _ := service.GetLastHisPatientCaseHistory(admin.CurrentOrgId, patient_id)
+
+	prescriptionInfo, _ := service.GetDialysisPresriptionById(admin.CurrentOrgId, patient_id, recordDateTime)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"his_info":     his_patient_info,
 		"xt_info":      xt_patient_info,
@@ -1723,6 +1725,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 		"last_info":          lastPatientPrescriptionInfo,
 		"befor":              beforThrity,
 		"LastCaseHistory":    LastCaseHistory,
+		"prescriptionInfo":   prescriptionInfo,
 	})
 	return
 

controllers/inspection_api_controller.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -37,6 +38,10 @@ func InspectionApiRegistRouters() {
 
 	beego.Router("/api/getnewinspectionList", &InspectionApiController{}, "Get:GetNewInspectionList")
 
+	beego.Router("/api/getnewinspectiondetaillist", &InspectionApiController{}, "Get:GetNewInspectionDetailList")
+
+	beego.Router("/api/editpatientnewinspection", &InspectionApiController{}, "Post:EditPatientNewInspection")
+
 }
 func (c *InspectionApiController) SetInspectionRemind() {
 	remind_cycle, _ := c.GetInt64("remind_cycle", 0)
@@ -1097,3 +1102,41 @@ func (c *InspectionApiController) GetNewInspectionList() {
 		"list":            inspectionInspectDateGroup,
 	})
 }
+
+func (c *InspectionApiController) GetNewInspectionDetailList() {
+
+	project_id, _ := c.GetInt64("project_id")
+
+	inspect_date, _ := c.GetInt64("inspect_date")
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	inspection, _ := service.GetNewInspectionDetailList(project_id, inspect_date, patient_id)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"inspection": inspection,
+	})
+}
+
+func (c *InspectionApiController) EditPatientNewInspection() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	inspection := models.Inspection{}
+
+	if dataBody["id"] == nil || reflect.TypeOf(dataBody["id"]).String() != "float64" {
+		utils.ErrorLog("id")
+		return
+	}
+
+	id := int64(dataBody["id"].(float64))
+
+	inspection.ID = id
+
+	fmt.Println("id------------------------------", id)
+}

controllers/manager_center_api_controller.go

@@ -1846,10 +1846,12 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	}
 	err, goodInfos := service.ModifyGoodInfo(&goodInfo)
 
-	list, _ := service.GetHisPrescripionProjectList(good_id, adminUserInfo.CurrentOrgId)
-	if len(list) > 0 {
-		for _, item := range list {
-			service.UpdateHisPrescriptionProjectList(item.ID, sell_price)
+	if adminUserInfo.CurrentOrgId != 10653 {
+		list, _ := service.GetHisPrescripionProjectList(good_id, adminUserInfo.CurrentOrgId)
+		if len(list) > 0 {
+			for _, item := range list {
+				service.UpdateHisPrescriptionProjectList(item.ID, sell_price)
+			}
 		}
 	}
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -947,6 +947,18 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		evaluation.WeightBefore = weighing_before
 		evaluation.AssessmentTime = time.Now().Unix()
 
+		if adminUserInfo.Org.Id == 10644 {
+			evaluation.PunctureNeedle = ""
+		}
+
+		//针对患者称重两次没有数据的问题
+		if adminUserInfo.Org.Id == 10702 {
+
+			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)
+			service.UpdateMobileGetDialysisPrescribeOne(lastDialysisPrescription.ID, dewater_amount)
+		}
+
 		err := service.UpadatePredialysisEvaluation(&evaluation)
 
 		//记录日志

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -5532,6 +5532,7 @@ func (c *DialysisAPIController) GetLongAdviceOne() {
 			dayStr2 := "-" + dayStr
 			count, _ := strconv.ParseInt(dayStr2, 10, 64)
 			oldTime := time.Now().AddDate(0, 0, int(count)).Unix()
+
 			advices, _ := service.FindAllDoctorAdviceByTime(now, oldTime, patient_id, adminUserInfo.Org.Id, advice.TemplateId)
 
 			for _, ad := range advices {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2236,100 +2236,100 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				}
 
 				////针对异常未出库问题的脚本
-				if adminInfo.Org.Id == 10644 {
-
-					newadviceInfo := &models.HisDoctorAdviceInfo{
-						ID:                    advice.ID,
-						UserOrgId:             advice.UserOrgId,
-						PatientId:             advice.PatientId,
-						HisPatientId:          advice.HisPatientId,
-						AdviceType:            advice.AdviceType,
-						AdviceDate:            advice.AdviceDate,
-						StartTime:             advice.StartTime,
-						AdviceName:            advice.AdviceName,
-						AdviceDesc:            advice.AdviceDesc,
-						ReminderDate:          advice.ReminderDate,
-						SingleDose:            advice.SingleDose,
-						SingleDoseUnit:        advice.SingleDoseUnit,
-						PrescribingNumber:     advice.PrescribingNumber,
-						PrescribingNumberUnit: advice.PrescribingNumberUnit,
-						DeliveryWay:           advice.DeliveryWay,
-						ExecutionFrequency:    advice.ExecutionFrequency,
-						AdviceDoctor:          advice.AdviceDoctor,
-						Status:                advice.Status,
-						CreatedTime:           advice.CreatedTime,
-						UpdatedTime:           advice.UpdatedTime,
-						AdviceAffirm:          advice.AdviceAffirm,
-						Remark:                advice.Remark,
-						StopTime:              advice.StopTime,
-						StopReason:            advice.StopReason,
-						StopDoctor:            advice.StopDoctor,
-						StopState:             advice.StopState,
-						ParentId:              advice.ParentId,
-						ExecutionTime:         advice.ExecutionTime,
-						ExecutionStaff:        advice.ExecutionStaff,
-						ExecutionState:        advice.ExecutionState,
-						Checker:               advice.Checker,
-						RecordDate:            advice.RecordDate,
-						DialysisOrderId:       advice.DialysisOrderId,
-						CheckTime:             advice.CheckTime,
-						CheckState:            advice.CheckState,
-						DrugSpec:              advice.DrugSpec,
-						DrugSpecUnit:          advice.DrugSpecUnit,
-						Groupno:               advice.Groupno,
-						RemindType:            advice.RemindType,
-						FrequencyType:         advice.FrequencyType,
-						DayCount:              advice.DayCount,
-						WeekDay:               advice.WeekDay,
-						TemplateId:            advice.TemplateId,
-						Modifier:              advice.Modifier,
-						DrugId:                advice.DrugId,
-						Price:                 advice.Price,
-						PrescriptionId:        advice.PrescriptionId,
-						MedListCodg:           advice.MedListCodg,
-						FeedetlSn:             advice.FeedetlSn,
-						Day:                   advice.DayCount,
-						ChildDoctorAdvice:     nil,
-						Drug:                  models.Drug{},
-						Diagnosis:             advice.Diagnosis,
-						Way:                   advice.Way,
-						HospApprFlag:          advice.HospApprFlag,
-						LmtUsedFlag:           advice.LmtUsedFlag,
-						HisOrderInfo:          models.HisOrderInfo{},
-						IsMedicine:            advice.IsMedicine,
-						ExecutionFrequencyId:  advice.ExecutionFrequencyId,
-						Child:                 nil,
-						IsSettle:              advice.IsSettle,
-						IsMobile:              advice.IsMobile,
-						IsSelfDrug:            advice.IsSelfDrug,
-						DrugWayCount:          advice.DrugWayCount,
-					}
-					outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
-					fmt.Println(outListExport)
-					//var out_count int64
-					//if len(outListExport) > 0 {
-					//	for _, item := range outListExport {
-					//		if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
-					//			out_count = item.Count * medical.MinNumber
-					//		}
-					//		if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
-					//			out_count = item.Count
-					//		}
-					//		if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
-					//			out_count = item.Count * medical.MinNumber
-					//		}
-					//
-					//	}
-					//}
-					//按最小单位出库
-					//var cha_count = total_count - out_count
-
-					var cha_count = 100
-					fmt.Println("cha_count--------------------------------------", cha_count)
-					newadviceInfo.PrescribingNumber = float64(cha_count)
-					newadviceInfo.PrescribingNumberUnit = medical.MinUnit
-					service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
-				}
+				//if adminInfo.Org.Id == 10644 {
+				//
+				//	newadviceInfo := &models.HisDoctorAdviceInfo{
+				//		ID:                    advice.ID,
+				//		UserOrgId:             advice.UserOrgId,
+				//		PatientId:             advice.PatientId,
+				//		HisPatientId:          advice.HisPatientId,
+				//		AdviceType:            advice.AdviceType,
+				//		AdviceDate:            advice.AdviceDate,
+				//		StartTime:             advice.StartTime,
+				//		AdviceName:            advice.AdviceName,
+				//		AdviceDesc:            advice.AdviceDesc,
+				//		ReminderDate:          advice.ReminderDate,
+				//		SingleDose:            advice.SingleDose,
+				//		SingleDoseUnit:        advice.SingleDoseUnit,
+				//		PrescribingNumber:     advice.PrescribingNumber,
+				//		PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				//		DeliveryWay:           advice.DeliveryWay,
+				//		ExecutionFrequency:    advice.ExecutionFrequency,
+				//		AdviceDoctor:          advice.AdviceDoctor,
+				//		Status:                advice.Status,
+				//		CreatedTime:           advice.CreatedTime,
+				//		UpdatedTime:           advice.UpdatedTime,
+				//		AdviceAffirm:          advice.AdviceAffirm,
+				//		Remark:                advice.Remark,
+				//		StopTime:              advice.StopTime,
+				//		StopReason:            advice.StopReason,
+				//		StopDoctor:            advice.StopDoctor,
+				//		StopState:             advice.StopState,
+				//		ParentId:              advice.ParentId,
+				//		ExecutionTime:         advice.ExecutionTime,
+				//		ExecutionStaff:        advice.ExecutionStaff,
+				//		ExecutionState:        advice.ExecutionState,
+				//		Checker:               advice.Checker,
+				//		RecordDate:            advice.RecordDate,
+				//		DialysisOrderId:       advice.DialysisOrderId,
+				//		CheckTime:             advice.CheckTime,
+				//		CheckState:            advice.CheckState,
+				//		DrugSpec:              advice.DrugSpec,
+				//		DrugSpecUnit:          advice.DrugSpecUnit,
+				//		Groupno:               advice.Groupno,
+				//		RemindType:            advice.RemindType,
+				//		FrequencyType:         advice.FrequencyType,
+				//		DayCount:              advice.DayCount,
+				//		WeekDay:               advice.WeekDay,
+				//		TemplateId:            advice.TemplateId,
+				//		Modifier:              advice.Modifier,
+				//		DrugId:                advice.DrugId,
+				//		Price:                 advice.Price,
+				//		PrescriptionId:        advice.PrescriptionId,
+				//		MedListCodg:           advice.MedListCodg,
+				//		FeedetlSn:             advice.FeedetlSn,
+				//		Day:                   advice.DayCount,
+				//		ChildDoctorAdvice:     nil,
+				//		Drug:                  models.Drug{},
+				//		Diagnosis:             advice.Diagnosis,
+				//		Way:                   advice.Way,
+				//		HospApprFlag:          advice.HospApprFlag,
+				//		LmtUsedFlag:           advice.LmtUsedFlag,
+				//		HisOrderInfo:          models.HisOrderInfo{},
+				//		IsMedicine:            advice.IsMedicine,
+				//		ExecutionFrequencyId:  advice.ExecutionFrequencyId,
+				//		Child:                 nil,
+				//		IsSettle:              advice.IsSettle,
+				//		IsMobile:              advice.IsMobile,
+				//		IsSelfDrug:            advice.IsSelfDrug,
+				//		DrugWayCount:          advice.DrugWayCount,
+				//	}
+				//	outListExport, _ := service.GetWarehouseOutListExport(advice.DrugId, advice.PatientId, advice.AdviceDate, advice.ID)
+				//	fmt.Println(outListExport)
+				//	//var out_count int64
+				//	//if len(outListExport) > 0 {
+				//	//	for _, item := range outListExport {
+				//	//		if item.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+				//	//			out_count = item.Count * medical.MinNumber
+				//	//		}
+				//	//		if item.CountUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+				//	//			out_count = item.Count
+				//	//		}
+				//	//		if item.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+				//	//			out_count = item.Count * medical.MinNumber
+				//	//		}
+				//	//
+				//	//	}
+				//	//}
+				//	//按最小单位出库
+				//	//var cha_count = total_count - out_count
+				//
+				//	var cha_count = 100
+				//	fmt.Println("cha_count--------------------------------------", cha_count)
+				//	newadviceInfo.PrescribingNumber = float64(cha_count)
+				//	newadviceInfo.PrescribingNumberUnit = medical.MinUnit
+				//	service.NewHisDrugsDelivery(advice.UserOrgId, creater, newadviceInfo, tx)
+				//}
 
 			}
 		}

controllers/orginfo_api_controller.go

@@ -1,13 +1,14 @@
 package controllers
 
 import (
+	"encoding/json"
+	"reflect"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"reflect"
-	"time"
 
 	"github.com/astaxie/beego"
 )
@@ -32,13 +33,17 @@ func (c *OrgInfoApiController) GetOrgInfo() {
 	provinces, _ := service.GetDistrictsByUpid(0)
 	var citys []*models.District
 	var districts []*models.District
-	if orgInfo.Province > 0 {
-		citys, _ = service.GetDistrictsByUpid(orgInfo.Province)
-	}
-	if orgInfo.City > 0 {
-		districts, _ = service.GetDistrictsByUpid(orgInfo.City)
+	if orgInfo != nil {
+		if orgInfo.Province > 0 {
+			citys, _ = service.GetDistrictsByUpid(orgInfo.Province)
+		}
+		if orgInfo.City > 0 {
+			districts, _ = service.GetDistrictsByUpid(orgInfo.City)
+		}
 	}
+	gallery, _ := service.GetUserGallery(orgInfo.Id)
 
+	orgInfo.OrgGallery = gallery
 	orgtypes, _ := service.GetOrgTypes()
 
 	illness, _ := service.GetIllnessList()
@@ -50,6 +55,7 @@ func (c *OrgInfoApiController) GetOrgInfo() {
 		"districts": districts,
 		"orgtypes":  orgtypes,
 		"illness":   illness,
+		"gallery":   gallery,
 	})
 	return
 }

service/district_service.go

@@ -11,6 +11,13 @@ func GetDistrictsByUpid(id int64) (dis []*models.District, err error) {
 	return
 }
 
+func GetUserGallery(id int64) (gallery []*models.OrgGallery, err error) {
+
+	err = readUserDb.Where("org_id = ? and status=1", id).Find(&gallery).Error
+
+	return gallery, err
+}
+
 func GetProvinceWithName(name string) (*models.District, error) {
 	var province models.District
 	err := readUserDb.Model(&models.District{}).Where("level = 1 AND name like ?", "%"+name+"%").First(&province).Error

service/his_service.go

@@ -3511,3 +3511,12 @@ func GetBasedrugByIdOne(drug_id int64, user_org_id int64) (models.BaseDrugLib, e
 //	err = writeDb.Save(&order).Error
 //	return
 //}
+
+func GetDialysisPresriptionById(user_org_id int64, patient_id int64, record_date int64) (models.HisPrescriptionInfo, error) {
+
+	prescriptionInfo := models.HisPrescriptionInfo{}
+
+	err := XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date = ? and status=1", user_org_id, patient_id, record_date).First(&prescriptionInfo).Error
+
+	return prescriptionInfo, err
+}

service/inspection_service.go

@@ -435,3 +435,10 @@ func GetNewGroupInspectionInspectionList(patient_id int64, project_id int64, use
 	err = XTReadDB().Where("patient_id = ? and project_id = ? and org_id = ?", patient_id, project_id, user_org_id).Group("inspect_date").Order("inspect_date asc").Find(&inspection).Error
 	return inspection, err
 }
+
+func GetNewInspectionDetailList(project_id int64, inspect_value int64, patient_id int64) (inpection []*models.Inspection, err error) {
+
+	err = XTReadDB().Where("project_id =? and inspect_date = ? and patient_id = ?", project_id, inspect_value, patient_id).Find(&inpection).Error
+
+	return inpection, err
+}