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

controllers/his_project_api_controller.go

@@ -149,6 +149,7 @@ func (this *HisProjectApiController) SaveProject() {
 			firstLetter += string(py[0][0])
 		}
 	}
+
 	hisProject := models.XtHisProject{
 		ProjectName:                 project_name,
 		Pinyin:                      firstLetter,
@@ -191,6 +192,10 @@ func (this *HisProjectApiController) SaveProject() {
 		ZuobiaoId:                   bbx01,
 		FirstLetter:                 firstLetter,
 	}
+	if this.GetAdminUserInfo().CurrentOrgId == 10206 {
+		de, _ := service.GetDepartMentDetail(executive_section)
+		hisProject.Bck01b = de.Number
+	}
 	//查询项目名称是否存在
 	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
 	if errcode == gorm.ErrRecordNotFound {
@@ -343,6 +348,10 @@ func (this *HisProjectApiController) UpdatedProject() {
 		ZuobiaoId:                   bbx01,
 		UserOrgId:                   orgId,
 	}
+	if this.GetAdminUserInfo().CurrentOrgId == 10206 {
+		de, _ := service.GetDepartMentDetail(executive_section)
+		hisProject.Bck01b = de.Number
+	}
 
 	err := service.UpdatedProject(id, &hisProject)
 

controllers/manager_center_api_controller.go

@@ -1682,6 +1682,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 		Bbx01:                       bbx01,
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
+		Bck01b:                      "55",
 	}
 	err, goodInfos := service.AddSigleGoodInfo(&goodInfo)
 	if err == nil {
@@ -1825,6 +1826,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 		Bbx01:                       bbx01,
 		Bby01:                       bby01,
 		ZuobiaoId:                   bbx01,
+		Bck01b:                      "55",
 	}
 
 	totals := service.FindGoodInfoByNameOne(specification_name, adminUserInfo.CurrentOrgId, good_id, id, good_name)

controllers/statistics_api_controller.go

@@ -1021,7 +1021,7 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 	}
 }
 func (c *StatisticsApiController) GetDialysisTotalDetailInfo() {
-	date_str := c.GetString("data")
+	date_str := c.GetString("date")
 	mode, _ := c.GetInt64("mode")
 	origin, _ := c.GetInt64("origin")
 	page, _ := c.GetInt64("page")

models/good_models.go

@@ -104,7 +104,9 @@ type GoodInfo struct {
 	SumInCount                  int64                `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	Bbx01                       string               `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 	Bby01                       string               `gorm:"column:bby01" json:"bby01" form:"bby01"`
-	ZuobiaoId                   string               `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	Bck01b                      string               `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
+
+	ZuobiaoId string `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
 
 	WarehousingInfoOne []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
 

models/his_models.go

@@ -48,6 +48,7 @@ type XtHisProject struct {
 	Bbx01                       string  `gorm:"column:bbx01" json:"bbx01" form:"bbx01"`
 	Bby01                       string  `gorm:"column:bby01" json:"bby01" form:"bby01"`
 	ZuobiaoId                   string  `gorm:"column:zuobiao_id" json:"zuobiao_id" form:"zuobiao_id"`
+	Bck01b                      string  `gorm:"column:bck01b" json:"bck01b" form:"bck01b"`
 }
 
 func (XtHisProject) TableName() string {
@@ -557,7 +558,7 @@ type HisPrescription struct {
 	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
+	HisPatient             VMHisPatient              `gorm:"ForeignKey:ID;AssociationForeignKey:HisPatientId" json:"hisPatient"`
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`

service/his_project_service.go

@@ -59,7 +59,7 @@ func GetProjectDetail(id int64) (models.XtHisProject, error) {
 
 func UpdatedProject(id int64, pro *models.XtHisProject) error {
 
-	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate, "is_print": pro.IsPrint, "bbx01": pro.Bbx01, "bby01": pro.Bby01, "zuobiao_id": pro.ZuobiaoId}).Error
+	err := XTWriteDB().Model(&pro).Where("id=?", id).Updates(map[string]interface{}{"project_name": pro.ProjectName, "pinyin": pro.Pinyin, "wubi": pro.Pinyin, "price": pro.Price, "unit": pro.Unit, "cost_classify": pro.CostClassify, "executive_section": pro.ExecutiveSection, "medical_coverage": pro.MedicalCoverage, "statistical_classification": pro.StatisticalClassification, "disease_directory": pro.DiseaseDirectory, "is_record": pro.IsRecord, "medical_code": pro.MedicalCode, "tube_color": pro.TubeColor, "medical_status": pro.MedicalStatus, "remark": pro.Remark, "sign": pro.Sign, "default_number": pro.DefaultNumber, "is_default": pro.IsDefault, "is_charge": pro.IsCharge, "is_estimate": pro.IsEstimate, "is_workload": pro.IsWorkload, "sort": pro.Sort, "doctor_advice": pro.DoctorAdvice, "single_dose": pro.SingleDose, "execution_frequency": pro.ExecutionFrequency, "delivery_way": pro.DeliveryWay, "number_days": pro.NumberDays, "total": pro.Total, "updated_time": pro.UpdatedTime, "category": pro.Category, "specail_project": pro.SpecailProject, "social_security_directory_code": pro.SocialSecurityDirectoryCode, "record_date": pro.RecordDate, "is_print": pro.IsPrint, "bbx01": pro.Bbx01, "bby01": pro.Bby01, "zuobiao_id": pro.ZuobiaoId, "bck01b": pro.Bck01b}).Error
 	return err
 }
 
@@ -419,7 +419,7 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 }
 
 func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string, orgid int64, p_type int64) (prescription []*models.HisPrescription, err error) {
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 and p_type = ? ", his_patient_id, recorddate, schIDs, p_type).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 and p_type = ? ", his_patient_id, recorddate, schIDs, p_type).Preload("HisPatient", "status = 1 and  user_org_id = ?", orgid).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 and user_org_id = ?", orgid).Preload("Drug", "status = 1")
 	}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", orgid).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")

service/statistis_qc_service.go

@@ -643,14 +643,14 @@ func GetPrescriptionByAnticoagulant(page int64, limit int64, orgid int64, antico
 
 func GetPrescriptionByDialyzer(page int64, limit int64, orgid int64, dialyzer string, start_time int64, end_time int64) (solution []*models.DialysisPrescription, total int64, err error) {
 
-	db := XTReadDB().Model(&models.DialysisPrescription{}).Where("status = 1")
+	db := XTReadDB().Model(&models.DialysisPrescription{}).Preload("QCPatients", "status = 1 and user_org_id = ?", orgid).Where("status = 1")
 	if len(dialyzer) > 0 {
 		db = db.Where("dialysis_dialyszers = ?", dialyzer)
 	}
 	if orgid > 0 {
 		db = db.Where("user_org_id = ?", orgid)
 	}
-	db = db.Where("record_date >= ? and record_date <= ?", start_time, end_time)
+	db = db.Where("record_date >= ? and record_date <= ? and status = 1", start_time, end_time)
 
 	offset := (page - 1) * limit
 
@@ -736,7 +736,8 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
 	      ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
 	      p.prescription_doctor as doctor,
-	      o.finish_nurse as nurse
+	      o.finish_nurse as nurse,
+	    	pp.id_card_no as id_card_no
 	   FROM
 	       xt_dialysis_order o
 		JOIN
@@ -765,7 +766,9 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
 	      ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
 	      p.prescription_doctor as doctor,
-	      o.finish_nurse as nurse
+	      o.finish_nurse as nurse,
+	   pp.id_card_no as id_card_no
+	      
 	   FROM
 	       xt_dialysis_order o
 		JOIN
@@ -793,7 +796,8 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
 	      ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
 	      p.prescription_doctor as doctor,
-	      o.finish_nurse as nurse
+	      o.finish_nurse as nurse,
+	   pp.id_card_no as id_card_no
 	   FROM
 	       xt_dialysis_order o
 		JOIN
@@ -821,7 +825,8 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 	      CONCAT(a.actual_treatment_hour, 'h', a.actual_treatment_minute,'min') as actual_duration,
 	      ABS(TIMESTAMPDIFF(MINUTE, MAKETIME(p.dialysis_duration_hour, p.dialysis_duration_minute, 0), MAKETIME(a.actual_treatment_hour, a.actual_treatment_minute, 0))) as diff,
 	      p.prescription_doctor as doctor,
-	      o.finish_nurse as nurse
+	      o.finish_nurse as nurse,
+	   pp.id_card_no as id_card_no
 	   FROM
 	       xt_dialysis_order o
 		JOIN
@@ -859,6 +864,7 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 		"diff":              0,
 		"doctor":            "",
 		"nurse":             "",
+		"id_card_no":        "",
 	}
 
 	// Create the dynamic struct type
@@ -882,6 +888,7 @@ func GetDialysisCompletionDetail(org_id int64, start_time int64, end_time int64,
 			reflect.ValueOf(result).Elem().FieldByName("Diff").Addr().Interface(),
 			reflect.ValueOf(result).Elem().FieldByName("Doctor").Addr().Interface(),
 			reflect.ValueOf(result).Elem().FieldByName("Nurse").Addr().Interface(),
+			reflect.ValueOf(result).Elem().FieldByName("Id_card_no").Addr().Interface(),
 		}
 
 		// Scan the row into the struct