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

 	remark := c.GetString("remark")
 	breathingfloat, _ := strconv.ParseFloat(breathing, 64)
 	fmt.Println("breathingfloat", breathingfloat)
+	sick, _ := c.GetInt64("sick")
+	diagnose, _ := c.GetInt64("diagnose")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
 		Breathing:               breathingfloat,
 		DoctorAdvice:            doctor_advice,
 		Remark:                  remark,
+		Sick:                    sick,
+		Diagnose:                diagnose,
 	}
 
 	err = service.SaveHisPatientCaseHistory(&caseHistory)
 			Idetinfo:    idetinfoStr,
 			PatientId:   patient.ID,
 			RecordDate:  theTime.Unix(),
+			UserOrgId:   adminInfo.CurrentOrgId,
+			AdminUserId: adminInfo.AdminUser.Id,
+			IsReturn:    1,
 		}
 		fmt.Println(his)
 
+		lastPatient, _ := service.GetLastPatient(adminInfo.CurrentOrgId)
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(lastPatient.ID, 10)
+
+		hisPatient := models.HisPatient{
+			Number: str,
+		}
+		err = service.UpdateHisPatient(lastPatient.ID, hisPatient)
+
 		if res.Output.Iinfo == nil || len(res.Output.Iinfo) == 0 {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterOneException)
 			return

controllers/his_project_api_controller.go

 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	_, errcode := service.GetHisTemplateId(template_id, orgId)
-	fmt.Println("errcode", errcode)
+	//fmt.Println("errcode", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		template := models.XtHisTemplate{
 			TemplateId: template_id,

controllers/stock_good_api_controller.go

 func (c *StockGoodApiController) CreateGoodType() {
 	type_name := c.GetString("type_name")
 	remark := c.GetString("remark")
+	out_stock := c.GetString("out_stock")
+	outStockInt, _ := strconv.ParseInt(out_stock, 10, 64)
 	adminUserInfo := c.GetAdminUserInfo()
 	totals := service.FindGoodTypeByName(type_name, adminUserInfo.CurrentOrgId)
 	if totals > 0 {
 		OrgId:    adminUserInfo.CurrentOrgId,
 		Creater:  adminUserInfo.AdminUser.Id,
 		Status:   1,
+		OutStock: outStockInt,
 	}
 	err, types := service.AddSigleGoodType(&goodType)
 	if err == nil {
 	type_name := c.GetString("type_name")
 	remark := c.GetString("remark")
 	good_type_code := c.GetString("type_code")
+	out_stock := c.GetString("out_stock")
+	outStockInt, _ := strconv.ParseInt(out_stock, 10, 64)
 	adminUserInfo := c.GetAdminUserInfo()
 
 	//totals := service.FindGoodTypeByName(type_name, adminUserInfo.CurrentOrgId)
 		OrgId:    adminUserInfo.CurrentOrgId,
 		Modifier: adminUserInfo.AdminUser.Id,
 		Status:   1,
+		OutStock: outStockInt,
 	}
 	err, types := service.ModifyGoodType(&goodType)
 	if err == nil {

models/good_models.go

 	Status   int64  `gorm:"column:status" json:"status"`
 	Type     int64  `gorm:"column:type" json:"type"`
 	Number   int64  `gorm:"column:number" json:"number"`
+	OutStock int64  `gorm:"column:out_stock" json:"out_stock" form:"out_stock"`
 }
 
 func (GoodsType) TableName() string {

models/his_models.go

 	Breathing               float64 `gorm:"column:breathing" json:"breathing" form:"breathing"`
 	DoctorAdvice            string  `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
 	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sick                    int64   `gorm:"column:sick" json:"sick" form:"sick"`
+	Diagnose                int64   `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
 }
 
 func (HisPatientCaseHistory) TableName() string {
 	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"`
-	//VMHisPrescriptionInfo  VMHisPrescriptionInfo     `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
+	VMHisPrescriptionInfo  HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
 }
 
 func (HisPrescription) TableName() string {

service/his_project_service.go

 
 func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string, orgid int64) (prescription []*models.HisPrescription, err error) {
 
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", "status = 1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", "status = 1 and user_org_id = ?", orgid).Preload("VMHisPrescriptionInfo", "status =1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
 
 	return prescription, err
 }

service/stock_service.go

 		"mtime":     time.Now().Unix(),
 		"remark":    goodType.Remark,
 		"type_name": goodType.TypeName,
+		"out_stock": goodType.OutStock,
 	}).Error
 	return err, goodType
 
 }
 
 func FindAllGoodType(org_id int64) (goodType []*models.GoodsType, err error) {
-	err = readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1", org_id).Find(&goodType).Error
+	err = readDb.Model(&models.GoodsType{}).Where("org_id = ? AND status = 1 and out_stock = 1", org_id).Find(&goodType).Error
 	return goodType, err
 }