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

@@ -473,6 +473,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	doctor_id, _ := c.GetInt64("doctor", 0)
 	department, _ := c.GetInt64("department", 0)
 	his_patient_id, _ := c.GetInt64("his_patient_id")
+
 	p_type, _ := c.GetInt64("p_type")
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -1871,6 +1872,11 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 		advice.Groupno = groupno
 	}
 
+	if json["hosp_appr_flag"] != nil && reflect.TypeOf(json["hosp_appr_flag"]).String() == "string" {
+		hosp_appr_flag, _ := strconv.ParseInt(json["hosp_appr_flag"].(string), 10, 64)
+		advice.HospApprFlag = hosp_appr_flag
+	}
+
 	if json["prescribing_number"] != nil && reflect.TypeOf(json["prescribing_number"]).String() == "string" {
 		prescribingNumber, _ := strconv.ParseFloat(json["prescribing_number"].(string), 64)
 		advice.PrescribingNumber = prescribingNumber
@@ -1895,6 +1901,7 @@ func (c *HisApiController) setAdviceWithJSON(advice *models.HisDoctorAdviceInfo,
 					advice.Checker = hisAdvice.Checker
 					advice.CheckState = hisAdvice.CheckState
 					advice.StartTime = hisAdvice.StartTime
+					advice.HospApprFlag = hisAdvice.HospApprFlag
 					//advice.Groupno = hisAdvice.Groupno
 
 				}
@@ -3763,6 +3770,7 @@ func (c *HisApiController) GetCompareData() {
 		theEndtTIme = theTime.Unix()
 	}
 	formData, err := service.GetCheckAccountFormData(theStartTIme, theEndtTIme, c.GetAdminUserInfo().CurrentOrgId, insutype)
+	fmt.Println(err)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list": formData,

controllers/new_mobile_api_controllers/mobile_his_api_controller.go

@@ -715,6 +715,10 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 		groupno := int64(json["groupno"].(float64))
 		advice.Groupno = groupno
 	}
+	if json["hosp_appr_flag"] != nil && reflect.TypeOf(json["hosp_appr_flag"]).String() == "string" {
+		hosp_appr_flag, _ := strconv.ParseInt(json["hosp_appr_flag"].(string), 10, 64)
+		advice.HospApprFlag = hosp_appr_flag
+	}
 
 	if json["advice_id"] != nil && reflect.TypeOf(json["advice_id"]).String() == "float64" {
 		advice_id := int64(json["advice_id"].(float64))
@@ -729,6 +733,7 @@ func (c *MobileHisApiController) setAdviceWithJSON(advice *models.HisDoctorAdvic
 					advice.CheckTime = hisAdvice.CheckTime
 					advice.Checker = hisAdvice.Checker
 					advice.CheckState = hisAdvice.CheckState
+					advice.HospApprFlag = hisAdvice.HospApprFlag
 					//advice.Groupno = hisAdvice.Groupno
 					//advice.StartTime = hisAdvice.StartTime
 
@@ -919,6 +924,7 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
 		project.Checker = temp_project.Checker
 		project.CheckState = temp_project.CheckState
 		project.CheckTime = temp_project.CheckTime
+		project.TeamId = temp_project.TeamId
 	}
 	if json["type"] != nil || reflect.TypeOf(json["type"]).String() == "float64" {
 		types := int64(json["type"].(float64))

service/his_service.go

@@ -1688,7 +1688,7 @@ type CustomAccountFormData struct {
 	CashPay            float64 `gorm:"column:cash_pay" json:"cash_pay" form:"cash_pay"`
 	Sumamt             float64 `gorm:"column:sumamt" json:"sumamt" form:"sumamt"`
 	Iinfo              string  `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
-	DiagnosisId        int64   `gorm:"column:diagnosis_id" json:"diagnosis_id" form:"diagnosis_id"`
+	DiagnosisId        string  `gorm:"column:diagnosis_id" json:"diagnosis_id" form:"diagnosis_id"`
 	DialysisCount      int64   `gorm:"-"`
 	PatientId          int64   `gorm:"column:patient_id" json:"dialysis_count" form:"dialysis_count"`
 	HifmiPay           float64 `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`