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

controllers/patient_api_controller.go

@@ -330,6 +330,7 @@ func (c *PatientApiController) GetPatientsList() {
 	patientSoureType, _ := c.GetInt64("patientSoureType")
 	patient_type, _ := c.GetInt64("patient_type")
 	nurse, _ := c.GetInt64("nurse")
+	insuplc_admdvs_name := c.GetString("insuplc_admdvs_name")
 	if page <= 0 {
 		page = 1
 	}
@@ -368,7 +369,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 	var patients []*models.Patients
 	var total int64
-	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse, patient_type)
+	patients, total, err = service.GetPatientList(adminUserInfo.CurrentOrgId, keywords, page, limit, schedulType, bindingState, lapseto, source, theStartTIme, theEndtTIme, contagion, reimbursement_way, isscheduling, isprescription, isStartTime, isEndTime, patientSoureType, nurse, patient_type, insuplc_admdvs_name)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"patients": patients,
@@ -6304,6 +6305,8 @@ func (c *PatientApiController) GetRemindPatientList() {
 	limit, _ := c.GetInt64("limit", 10)
 	adminUserInfo := c.GetAdminUserInfo()
 	total, patients, _ := service.GetAllWaitRemindPatient(adminUserInfo.CurrentOrgId, page, limit)
+
+	patientZoneList, _ := service.GetPatientZoneList(adminUserInfo.CurrentOrgId)
 	_, errcode := service.GetOrgFollowIsExist(c.GetAdminUserInfo().CurrentOrgId)
 	if errcode == gorm.ErrRecordNotFound {
 		information, err := service.GetAdminUserRoleInformation(0)
@@ -6313,9 +6316,10 @@ func (c *PatientApiController) GetRemindPatientList() {
 			return
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"total":       total,
-			"patients":    patients,
-			"information": information,
+			"total":           total,
+			"patients":        patients,
+			"information":     information,
+			"patientZoneList": patientZoneList,
 		})
 	} else if errcode == nil {
 		information, err := service.GetAdminUserRoleInformation(c.GetAdminUserInfo().CurrentOrgId)
@@ -6325,9 +6329,10 @@ func (c *PatientApiController) GetRemindPatientList() {
 			return
 		}
 		c.ServeSuccessJSON(map[string]interface{}{
-			"total":       total,
-			"patients":    patients,
-			"information": information,
+			"total":           total,
+			"patients":        patients,
+			"information":     information,
+			"patientZoneList": patientZoneList,
 		})
 	}
 }

controllers/pharmacy_controller.go

@@ -325,7 +325,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 	list, err = service.GetPatientMedication(orgid, patient_id, stime, etime, is_medicine)
 	list_p, err := service.GetPatientProject(orgid, patient_id, stime, etime, is_medicine)
 	list = append(list, list_p...)
-	//baseList, _ := service.GetAllBaseDrugListTwo(orgid)
+	baseList, _ := service.GetAllBaseDrugListTwo(orgid)
 	patients, _ := service.GetPatientByIDOne(orgid, patient_id)
 	//zoneList, _ := service.GetAllZoneByList(orgid)
 	appId := this.GetAdminUserInfo().CurrentAppId
@@ -347,6 +347,7 @@ func (this *PharmacyController) GetPharmacyContent() {
 	return_value["prescription"] = prescriptionListByToDay
 	return_value["diagnose"] = diagnose
 	return_value["config"] = config
+	return_value["baseList"] = baseList
 
 	this.ServeSuccessJSON(return_value)
 	return

controllers/statistics_api_controller.go

@@ -1396,7 +1396,6 @@ func (c *StatisticsApiController) GetAnticoagulant() {
 	var startTime int64
 	if len(start_date) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
-		fmt.Println("err-----------", err)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return

models/patient_models.go

@@ -105,6 +105,7 @@ type VMDoctorAdviceForList struct {
 	CheckTime      int64 `gorm:"column:check_time" json:"check_time" form:"check_time"`
 	CheckState     int64 `gorm:"column:check_state" json:"check_state" form:"check_state"`
 	ParentId       int64 `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	AdviceType     int64 `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
 }
 
 func (VMDoctorAdviceForList) TableName() string {
@@ -1268,6 +1269,7 @@ type XtPatients struct {
 	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Url                          string  `gorm:"column:url" json:"url" form:"url"`
 	FirstLetter                  string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	InsuplcAdmdvsName            string  `gorm:"column:insuplc_admdvs_name" json:"insuplc_admdvs_name" form:"insuplc_admdvs_name"`
 }
 
 func (XtPatients) TableName() string {

service/patient_service.go

@@ -14,7 +14,7 @@ import (
 )
 
 // GetPatientList 返回患者的列表
-func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64, patient_type int64) (patients []*models.Patients, total int64, err error) {
+func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bindingState, lapseto, source, startTime, endTime, contagion, reimbursementWay, isscheduling, isprescription int64, isStartTime, isEndTime bool, patientSoureType int64, nurse int64, patient_type int64, insuplc_admdvs_name string) (patients []*models.Patients, total int64, err error) {
 
 	db := readDb.Table("xt_patients as p").Where("p.status=1")
 	if orgID > 0 {
@@ -26,6 +26,11 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 		db = db.Where("p.name LIKE ? OR p.dialysis_no LIKE ? OR p.first_letter LIKE ?", likeKey, likeKey, likeKey)
 	}
 
+	if insuplc_admdvs_name != "全部" {
+
+		db = db.Where("p.insuplc_admdvs_name = ?", insuplc_admdvs_name)
+	}
+
 	if schedulType > 0 {
 		db = db.Joins("JOIN xt_schedule as s ON s.patient_id=p.id")
 		db = db.Where("s.status=1 and s.schedule_type=?", schedulType)
@@ -1900,6 +1905,13 @@ func GetAllWaitRemindPatient(org_id int64, page int64, limit int64) (total int64
 	return totals.Count, patient, err
 }
 
+func GetPatientZoneList(org_id int64) (patients []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status =1 and patient_type =1 and insuplc_admdvs_name!=''", org_id).Group("insuplc_admdvs_name").Find(&patients).Error
+
+	return patients, err
+}
+
 func UpdatePatientRemindStatus(patient_id int64, remind int64, org_id int64) (err error) {
 	err = writeDb.Model(&models.Patients{}).Where("status = 1  AND id = ? AND user_org_id = ?", patient_id, org_id).Updates(map[string]interface{}{"is_open_remind": remind}).Error
 	return
@@ -3317,15 +3329,15 @@ func GetNewMonitorRecord(orgID int64, date int64, partition int64, patientId int
 func GetAdviceList(user_org_id int64, advice_date int64, pat_type int64) (advice []*models.VMDoctorAdviceForList, err error) {
 
 	if pat_type == 0 {
-		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =7 and check_time = 0", user_org_id, advice_date).Find(&advice).Error
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =7 and check_time = 0 and (advice_type=2 or advice_type =3)", user_org_id, advice_date).Find(&advice).Error
 	}
 	//待医嘱核对
 	if pat_type == 1 {
-		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =1 and check_time = 0", user_org_id, advice_date).Find(&advice).Error
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =1 and check_time = 0 and (advice_type=2 or advice_type =3)", user_org_id, advice_date).Find(&advice).Error
 	}
 	//待医嘱执行
 	if pat_type == 6 {
-		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =1 and execution_state = 2", user_org_id, advice_date).Find(&advice).Error
+		err = XTReadDB().Where("user_org_id = ? and advice_date = ? and status =1 and execution_state = 2 and (advice_type=2 or advice_type =3)", user_org_id, advice_date).Find(&advice).Error
 
 	}
 	return advice, err

service/warhouse_service.go

@@ -6112,9 +6112,9 @@ func UpdateDrugWarehouseOutInfo(id int64, warehouse_info_id int64, org_id int64,
 	return err
 }
 
-func UpdateNewDrugWarehouseOutInfo(id int64, warehouse_info_id int64, org_id int64, over_count int64, drug_price float64, tx *gorm.DB) error {
+func UpdateNewDrugWarehouseOutInfo(id int64, warehouse_info_id int64, org_id int64, over_count int64, drug_price float64, batch_number string, tx *gorm.DB) error {
 
-	err = tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count, "price": drug_price, "retail_price": drug_price}).Error
+	err = tx.Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count, "price": drug_price, "retail_price": drug_price, "batch_number": batch_number}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -6145,9 +6145,9 @@ func GetDrugOutFlowByWarehouseOut(drug_id int64, warehouse_out_detail_id int64,
 	return flow, err
 }
 
-func UpdateNewGoodWarehouseOutById(id int64, warehouse_info_id int64, org_id int64, over_count int64, tx *gorm.DB) error {
+func UpdateNewGoodWarehouseOutById(id int64, warehouse_info_id int64, org_id int64, over_count int64, number string, tx *gorm.DB) error {
 
-	err := tx.Model(models.WarehouseOutInfo{}).Where("id = ?  and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count}).Error
+	err := tx.Model(models.WarehouseOutInfo{}).Where("id = ?  and org_id = ? and status = 1", id, org_id).Update(map[string]interface{}{"warehouse_info_id": warehouse_info_id, "over_count": over_count, "number": number}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -8340,7 +8340,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 		}
 
 		//添加入库ID
-		errWarehouse := UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, tx)
+		errWarehouse := UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, warehouse.Number, tx)
 		if errWarehouse != nil {
 			goodErrcode := models.XtGoodErrcode{
 				UserOrgId:      orgID,
@@ -8668,7 +8668,7 @@ func ConsumableNewPrescriptionDelivery(orgID int64, patient_id int64, record_tim
 			ModifyNewAddGoodSumCount(goods.StorehouseId, flow.Count, orgID, goods.GoodId, tx)
 		}
 
-		errWarehouse := UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, tx)
+		errWarehouse := UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, warehouse.Number, tx)
 		if errWarehouse != nil {
 			goodErrcode := models.XtGoodErrcode{
 				UserOrgId:      orgID,
@@ -8934,7 +8934,7 @@ func ConsumableNewHisPrescriptionDelivery(orgID int64, patient_id int64, record_
 
 		ModifyNewGoodSumCount(goods.StorehouseId, stock_number, orgID, goods.GoodId, tx)
 
-		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, tx)
+		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, orgID, sum_count, warehouse.Number, tx)
 
 	}
 	dialyPrepareOne := &models.DialysisBeforePrepare{
@@ -10925,7 +10925,7 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 		CreateOutInfoLog(outInfoLog, tx)
 
 		//添加入库ID
-		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, goods.OrgId, sum_count, tx)
+		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, goods.OrgId, sum_count, warehouse.Number, tx)
 
 		//更新出库数量
 		ModifyNewGoodSumCount(goods.StorehouseId, goods.Count, goods.OrgId, goods.GoodId, tx)
@@ -11002,7 +11002,7 @@ func ConsumablesNewDeliveryThirty(orgID int64, record_time int64, goods *models.
 
 		CreateOutInfoLog(outInfoLog, tx)
 
-		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, goods.OrgId, sum_count, tx)
+		UpdateNewGoodWarehouseOutById(goods.ID, warehouse.ID, goods.OrgId, sum_count, warehouse.Number, tx)
 
 		//更新出库数量
 		ModifyNewGoodSumCount(goods.StorehouseId, stock_number, goods.OrgId, goods.GoodId, tx)
@@ -11268,7 +11268,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 		CreateDrugOutInfoLog(outInfoLog, tx)
 
 		//更新出库id
-		UpdateNewDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
+		UpdateNewDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, warehouse.BatchNumber, tx)
 
 		return nil
 
@@ -11348,7 +11348,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 		}
 		CreateDrugOutInfoLog(outInfoLog, tx)
 		//更新出库id
-		UpdateNewDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, tx)
+		UpdateNewDrugWarehouseOutInfo(advice.ID, warehouse.ID, advice.OrgId, over_count, drug_price, warehouse.Number, tx)
 		// 出库完成后，要将该批次库存清零
 
 		prescribingNumber_two_temp := deliver_number - stock_number