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

controllers/his_api_controller.go

 	beego.Router("/api/hisprescription/delete", &HisApiController{}, "post:DeletePrescription")
 	beego.Router("/api/advice/delete", &HisApiController{}, "post:DeleteDoctorAdvice")
 	beego.Router("/api/project/delete", &HisApiController{}, "post:DeleteProject")
+	beego.Router("/api/addition_charge/delete", &HisApiController{}, "post:DeleteAddition")
 
 	beego.Router("/api/hisprescription/list", &HisApiController{}, "get:GetHisPrescriptionList")
 	beego.Router("/api/hisprescription/info", &HisApiController{}, "get:GetHisPrescriptionInfo")
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
-	addtions, _ := service.GetAllAdditionCharge(admin.CurrentOrgId, patient_id, recordDateTime)
+	//addtions, _ := service.GetAllAdditionCharge(admin.CurrentOrgId, patient_id, recordDateTime)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"his_info":        his_patient_info,
-		"xt_info":         xt_patient_info,
-		"prescription":    prescriptions,
-		"case_history":    case_history,
-		"info":            patientPrescriptionInfo,
-		"last_info":       lastPatientPrescriptionInfo,
-		"order":           order,
-		"addtions_charge": addtions,
+		"his_info":     his_patient_info,
+		"xt_info":      xt_patient_info,
+		"prescription": prescriptions,
+		"case_history": case_history,
+		"info":         patientPrescriptionInfo,
+		"last_info":    lastPatientPrescriptionInfo,
+		"order":        order,
 	})
 	return
 
 	diagnose := c.GetString("diagnose")
 	sick_history := c.GetString("sick_history")
 	doctor_id, _ := c.GetInt64("doctor", 0)
-	department := c.GetString("department")
+	department, _ := c.GetInt64("department", 0)
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 						}
 					}
 				}
+				if items["addition"] != nil && reflect.TypeOf(items["addition"]).String() == "[]interface {}" {
+					addition := items["addition"].([]interface{})
+					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
+					ctime := time.Now().Unix()
+					mtime := ctime
+					if len(addition) > 0 {
+						for _, item := range addition {
+							var s models.HisAdditionalCharge
+							s.PrescriptionId = prescription.ID
+							s.Status = 1
+							s.UserOrgId = adminInfo.CurrentOrgId
+							s.RecordDate = recordDateTime
+							s.CreatedTime = ctime
+							s.UpdatedTime = mtime
+							s.PatientId = patient_id
+							s.HisPatientId = his_patient_id
+							errcode := c.setAddtionWithJSON(&s, item.(map[string]interface{}))
+							if errcode > 0 {
+								c.ServeFailJSONWithSGJErrorCode(errcode)
+								return
+							}
+							service.CreateAdditionalCharge(&s)
+							var randNum int
+							randNum = rand.Intn(10000) + 1000
+							timestamp := time.Now().Unix()
+							tempTime := time.Unix(timestamp, 0)
+							timeFormat := tempTime.Format("20060102150405")
+							s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "3" + "-" + strconv.FormatInt(s.ID, 10)
+							service.CreateAdditionalCharge(&s)
+
+						}
+					}
+				}
+
 			}
 		}
 	}
 	return 0
 }
 
+func (c *HisApiController) setAddtionWithJSON(additionalCharge *models.HisAdditionalCharge, json map[string]interface{}) int {
+	if json["id"] != nil || reflect.TypeOf(json["id"]).String() == "float64" {
+		id := int64(json["id"].(float64))
+		additionalCharge.ID = id
+	}
+	if json["item_id"] != nil || reflect.TypeOf(json["item_id"]).String() == "float64" {
+		item_id := int64(json["item_id"].(float64))
+		additionalCharge.ItemId = item_id
+	}
+	if json["price"] != nil || reflect.TypeOf(json["price"]).String() == "float64" {
+		price := int64(json["price"].(float64))
+		formatInt_price := strconv.FormatInt(price, 10)
+		float_price, _ := strconv.ParseFloat(formatInt_price, 64)
+		additionalCharge.Price = float_price
+	}
+	if json["count"] != nil && reflect.TypeOf(json["count"]).String() == "string" {
+		count, _ := json["count"].(string)
+		counts, _ := strconv.ParseInt(count, 10, 64)
+		additionalCharge.Count = counts
+	}
+	if json["item_name"] != nil && reflect.TypeOf(json["item_name"]).String() == "string" {
+		item_name, _ := json["item_name"].(string)
+		additionalCharge.ItemName = item_name
+	}
+
+	return 0
+}
+
 func (c *HisApiController) GetHisOrderList() {
 	adminUser := c.GetAdminUserInfo()
 	org_id := adminUser.CurrentOrgId
 		ipt_otp_no := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
 
 		count, _ := service.FindHisRegisterRecord(theTime.Unix(), patient.ID, adminInfo.CurrentOrgId)
+
+		department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
+
 		if count <= 0 {
 			api := "http://127.0.0.1:9531/" + "gdyb/two?cert_no=" + patient.IdCardNo + "&insutype=" +
 				res.Output.Iinfo[0].Insutype + "&psn_no=" + res.Output.Baseinfo.PsnNo +
 				"&org_name=" + miConfig.OrgName + "&doctor=" + patientPrescription.Doctor + "&ipt_otp_no=" + ipt_otp_no +
-				"&dept=" + patientPrescription.Departments + "&fixmedins_code=" + miConfig.Code
+				"&dept=" + department.Name + "&fixmedins_code=" + miConfig.Code
 			resp, requestErr := http.Get(api)
 			if requestErr != nil {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			err := service.CreateHisPatientTwo(&his)
 			if err == nil {
 				api := "http://127.0.0.1:9531/" + "gdyb/four?psn_no=" + his.PsnNo +
-					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + patientPrescription.Departments +
+					"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&department=" + department.Name +
 					"&diag=" + patientPrescription.Diagnosis + "&org_name=" + miConfig.OrgName + "&med_type=" + "11" + "&doctor_id=" + strconv.FormatInt(patientPrescription.DoctorId, 10) + "&fixmedins_code=" + miConfig.Code
 				resp, requestErr := http.Get(api)
 				if requestErr != nil {
 	recordDateTime := theTime.Unix()
 	adminUser := c.GetAdminUserInfo()
 	prescriptions, _ := service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
-	additions, _ := service.GetAllAdditionCharge(adminUser.CurrentOrgId, id, recordDateTime)
 
 	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
 
 	data["fixmedins_code"] = miConfig.Code
 
 	var ids []int64
-	var idsTwo []int64
-
+	//var idsTwo []int64
+	//
 	for _, item := range prescriptions {
 		ids = append(ids, item.ID)
 	}
 
-	for _, item := range additions {
-		idsTwo = append(idsTwo, item.ID)
-	}
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 
 	if config.IsOpen == 1 { //对接了医保，走医保流程
 					total = total + (subItem.Price * float64(subItem.Count))
 				}
 			}
-		}
-
-		for _, item := range additions {
-			total = total + item.Price
 
+			for _, subItem := range item.HisAdditionalCharge {
+				total = total + (subItem.Price * float64(subItem.Count))
+			}
 		}
 
 		allTotal := fmt.Sprintf("%.2f", total)
 
 			if item.Type == 2 { //项目
 				for _, subItem := range item.HisPrescriptionProject {
+
 					cus := &Custom{
 						AdviceId:         0,
 						ProjectId:        subItem.ID,
 					customs = append(customs, cus)
 				}
 			}
-		}
 
-		for _, item := range additions {
-			cus := &Custom{
-				ItemId:           item.ID,
-				AdviceId:         0,
-				ProjectId:        0,
-				DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
-				Cut:              fmt.Sprintf("%.2f", float64(1)),
-				FeedetlSn:        item.FeedetlSn,
-				Price:            fmt.Sprintf("%.2f", float64(item.Price)),
-				MedListCodg:      item.XtHisAddtionConfig.Code,
-				Type:             3,
+			for _, item := range item.HisAdditionalCharge {
+				cus := &Custom{
+					ItemId:           item.ID,
+					AdviceId:         0,
+					ProjectId:        0,
+					DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
+					Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
+					FeedetlSn:        item.FeedetlSn,
+					Price:            fmt.Sprintf("%.2f", float64(item.Price)),
+					MedListCodg:      item.XtHisAddtionConfig.Code,
+					Type:             3,
+				}
+
+				customs = append(customs, cus)
 			}
 
-			customs = append(customs, cus)
 		}
 
 		for _, item := range customs {
 			} else if item.Type == 3 {
 				advice_id = 0
 				item_id = item.ItemId
-
 				project_id = 0
 			}
 
 			}
 			service.CreateOrderInfo(info)
 		}
-		err := service.UpDateAddtionNumber(adminUser.CurrentOrgId, idsTwo, chrg_bchno)
+		//err := service.UpDateAddtionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
 		err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
 		err = service.UpDatePrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime)
 		err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
 		"additional_charges": additionalCharges,
 	})
 }
+
+func (this *HisApiController) DeleteAddition() {
+	id, _ := this.GetInt64("id")
+	//TODO 需要判断是否已经结算
+	err := service.DelelteAddition(id, this.GetAdminUserInfo().CurrentOrgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"msg": "删除成功",
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+}

controllers/his_project_api_controller.go

 			IsNeedCostOfProduction: cost_checked,
 			TreatmentCost:          medicalExpense_float,
 			MedicalInsuranceNumber: medicalinsurancecard,
-			Name:                   name,
-			RegisterType:           register,
-			RegisterCost:           registrationfees_float,
-			BalanceAccountsType:    settlementValue,
-			Gender:                 sex,
-			Total:                  totals_float,
-			UserOrgId:              orgId,
-			Status:                 1,
-			RecordDate:             nowtime,
-			IsReturn:               1,
-			Ctime:                  time.Now().Unix(),
-			Phone:                  phone,
-			SocialType:             social_type,
+			Name:                name,
+			RegisterType:        register,
+			RegisterCost:        registrationfees_float,
+			BalanceAccountsType: settlementValue,
+			Gender:              sex,
+			Total:               totals_float,
+			UserOrgId:           orgId,
+			Status:              1,
+			RecordDate:          nowtime,
+			IsReturn:            1,
+			Ctime:               time.Now().Unix(),
+			Phone:               phone,
+			SocialType:          social_type,
 		}
 		err := service.CreateHisPatient(&patient)
 		lastPatient, err := service.GetLastPatient(orgId)
 			RecordDate:             nowtime,
 			Status:                 1,
 			IsReturn:               1,
+			Name:                name,
+			RegisterType:        register,
+			RegisterCost:        registrationfees_float,
+			BalanceAccountsType: settlementValue,
+			Gender:              sex,
+			Total:               totals_float,
+			UserOrgId:           orgId,
+			PatientId:           bloodPatient.ID,
+			Ctime:               time.Now().Unix(),
+			Phone:               phone,
+			SocialType:          social_type,
+			RecordDate:          nowtime,
 		}
 		err := service.CreateHisPatient(&patient)
 		lastPatient, err := service.GetLastPatient(orgId)

controllers/manager_center_api_controller.go

 
 func (c *ManagerCenterApiController) CreateBaseDrugLib() {
 	drug_name := c.GetString("drug_name")
-	fmt.Println("0000000")
-
-	fmt.Println(drug_name)
 	pinyin := c.GetString("pinyin")
 	wubi := c.GetString("wubi")
 	drug_alias := c.GetString("drug_alias")

controllers/mobile_api_controllers/dialysis_api_controller.go

 		PreImpulse:                 pre_impulse,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                      blood,
+		Blood: blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
 		ALiquid:                   a_liquid,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		Blood:                     blood,
+		Blood: blood,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)

models/his_models.go

 	Diagnosis          string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType       string `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor             string `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments        string `gorm:"column:departments" json:"departments" form:"departments"`
+	Departments        int64  `gorm:"column:departments" json:"departments" form:"departments"`
 	SickHistory        string `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
 	PrescriptionNumber string `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	PrescriptionStatus int64  `gorm:"column:prescription_status" json:"prescription_status" form:"prescription_status"`
 	HisPatient             VMHisPatient              `gorm:"ForeignKey:PatientId;AssociationForeignKey:patient_id" json:"hisPatient"`
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"advices"`
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"project"`
-	XtHisAdditionalCharge  []*XtHisAdditionalCharge  `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"additionalcharge"`
+	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PatientId,RecordDate,PrescriptionId;AssociationForeignKey:PatientId,RecordDate,ID" json:"addition"`
 }
 
 func (HisPrescription) TableName() string {
 	PrescriptionNumber string             `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
 	XtHisAddtionConfig XtHisAddtionConfig `gorm:"ForeignKey:ID;AssociationForeignKey:ItemId" json:"config"`
 	FeedetlSn          string             `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	PrescriptionId     int64              `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              int64              `gorm:"column:count" json:"count" form:"count"`
 }
 
 func (HisAdditionalCharge) TableName() string {

service/gdyb_service.go

 	for _, item := range hisPrescription {
 		if item.Type == 1 { //药品
 			for _, subItem := range item.HisDoctorAdviceInfo {
-
-				//var randNum int
-				//randNum = rand.Intn(10000) + 1000
-				cus := &Custom{
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-					Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
-					FeedetlSn:        subItem.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", subItem.Price),
-					MedListCodg:      subItem.MedListCodg,
+				if len(subItem.MedListCodg) > 0 {
+					//var randNum int
+					//randNum = rand.Intn(10000) + 1000
+					cus := &Custom{
+						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
+						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.2f", subItem.Price),
+						MedListCodg:      subItem.MedListCodg,
+					}
+
+					customs = append(customs, cus)
 				}
-
-				customs = append(customs, cus)
 			}
 		}
 
 			for _, subItem := range item.HisPrescriptionProject {
 				//var randNum int
 				//randNum = rand.Intn(10000) + 1000
+				if len(subItem.MedListCodg) > 0 {
+
+					cus := &Custom{
+						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
+						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						FeedetlSn:        subItem.FeedetlSn,
+						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+						MedListCodg:      subItem.MedListCodg,
+					}
+					customs = append(customs, cus)
+				}
+			}
+		}
+
+		for _, subItem := range item.HisAdditionalCharge {
+			if len(subItem.XtHisAddtionConfig.Code) > 0 {
 				cus := &Custom{
 					DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
 					Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
 					FeedetlSn:        subItem.FeedetlSn,
 					Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
-					MedListCodg:      subItem.MedListCodg,
+					MedListCodg:      subItem.XtHisAddtionConfig.Code,
 				}
-				fmt.Println(cus.FeedetlSn)
-
 				customs = append(customs, cus)
 			}
 		}

service/his_service.go

 
 func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", "status = 1 AND user_org_id = ?", org_id).
 		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 	Diagnosis             string                       `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
 	RegisterType          string                       `gorm:"column:register_type" json:"register_type" form:"register_type"`
 	Doctor                string                       `gorm:"column:doctor" json:"doctor" form:"doctor"`
-	Departments           string                       `gorm:"column:departments" json:"departments" form:"departments"`
+	Departments           int64                        `gorm:"column:departments" json:"departments" form:"departments"`
 	SickHistory           string                       `gorm:"column:sick_history" json:"sick_history" form:"sick_history"`
 	Patients              models.Patients              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	HisPatient            models.HisPatient            `gorm:"ForeignKey:HisPatientId,RecordDate;AssociationForeignKey:ID,RecordDate" json:"his_patient"`
 func UpdataOrderStatusTwo(number string, user_org_id int64) (err error) {
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 2, "mtime": time.Now().Unix()}).Error
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 3, "mtime": time.Now().Unix()}).Error
-	err = writeDb.Model(&models.HisAdditionalCharge{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 2, "mtime": time.Now().Unix()}).Error
-
 	return
 }
 
 	return
 
 }
+
+func DelelteAddition(id int64, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisAdditionalCharge{}).Where("user_org_id = ? AND id = ?", user_org_id, id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return
+}