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

controllers/gdyb_controller.go

@@ -35,7 +35,7 @@ func (c *GdybController) PostTwo() {
 	psnNo := c.GetString("psn_no")
 	insutype := c.GetString("insutype")
 	certNo := c.GetString("cert_no")
-	result := service.Gdyb2201(psnNo,insutype,certNo)
+	result := service.Gdyb2201(psnNo, insutype, certNo)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -44,7 +44,7 @@ func (c *GdybController) PostTwo() {
 func (c *GdybController) PostThree() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
-	result := service.Gdyb2202(psnNo,mdtrtId)
+	result := service.Gdyb2202(psnNo, mdtrtId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -53,7 +53,7 @@ func (c *GdybController) PostThree() {
 func (c *GdybController) PostFour() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
-	result := service.Gdyb2203(psnNo,mdtrtId)
+	result := service.Gdyb2203(psnNo, mdtrtId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -62,7 +62,10 @@ func (c *GdybController) PostFour() {
 func (c *GdybController) PostFive() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
-	result := service.Gdyb2204(psnNo,mdtrtId)
+	prescriptions, _ := service.GetHisPrescription(4, 1, 1605715200)
+
+	result := service.Gdyb2204(psnNo, mdtrtId, prescriptions)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -72,7 +75,7 @@ func (c *GdybController) PostSix() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
 	chrgBchno := c.GetString("chrg_bchno")
-	result := service.Gdyb2205(psnNo,mdtrtId,chrgBchno)
+	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -84,7 +87,7 @@ func (c *GdybController) PostSeven() {
 	chrgBchno := c.GetString("chrg_bchno")
 	certNo := c.GetString("cert_no")
 	insutype := c.GetString("insutype")
-	result := service.Gdyb2206(psnNo,mdtrtId,chrgBchno,certNo,insutype)
+	result := service.Gdyb2206(psnNo, mdtrtId, chrgBchno, certNo, insutype)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -96,7 +99,7 @@ func (c *GdybController) PostEight() {
 	chrgBchno := c.GetString("chrg_bchno")
 	certNo := c.GetString("cert_no")
 	insutype := c.GetString("insutype")
-	result := service.Gdyb2207(psnNo,mdtrtId,chrgBchno,certNo,insutype)
+	result := service.Gdyb2207(psnNo, mdtrtId, chrgBchno, certNo, insutype)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -106,8 +109,8 @@ func (c *GdybController) PostNine() {
 	psnNo := c.GetString("psn_no")
 	mdtrtId := c.GetString("mdtrt_id")
 	setlId := c.GetString("setl_id")
-	result := service.Gdyb2208(psnNo,mdtrtId,setlId)
+	result := service.Gdyb2208(psnNo, mdtrtId, setlId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
-}
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -336,7 +336,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 {
 		dewater_amount = dewater_amount * 1000
 
 		if dewater_amount < 0 {
@@ -643,7 +643,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		evaluation.WeightBefore = weighing_before
 		evaluation.AssessmentTime = time.Now().Unix()
 
-		err := service.UpadatePredialysisEvaluation(&evaluation)
+		err = service.UpadatePredialysisEvaluation(&evaluation)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 			return

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1414,7 +1414,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 {
 			dewater_amount = dewater_amount * 1000
 
 		}

models/his_models.go

@@ -192,6 +192,7 @@ type HisDoctorAdviceInfo struct {
 	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Price                 float64 `gorm:"column:price" json:"price" form:"price"`
 	PrescriptionId        int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string  `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {
@@ -413,6 +414,7 @@ type HisPrescriptionProject struct {
 	HisPatientId   int64   `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
 	RecordDate     int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	PrescriptionId int64   `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count          int64   `gorm:"column:count" json:"count" form:"count"`
 }
 
 func (HisPrescriptionProject) TableName() string {

service/his_service.go

@@ -121,7 +121,7 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 		Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ?", org_id).
 		Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ?", org_id).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ?", org_id, record_date, patient_id).
-		First(&prescription).Error
+		Find(&prescription).Error
 	return
 }