Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sz/sz_his_api_controller.go

@@ -2143,7 +2143,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	his_patient_id, _ := c.GetInt64("his_patient_id")
-
+	fmt.Println(his_patient_id)
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
@@ -2215,7 +2215,7 @@ func (c *SZHisApiController) GetSettleInfo() {
 	adminRole_two, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, patientPrescription.DoctorId)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	his, err := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
+	his, err := service.GetHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
 	mz_number := his.Number
 	number := miConfig.Code + year + month + day +
 		fmt.Sprintf("%07v", rand.New(rand.NewSource(time.Now().UnixNano())).Int31n(10000000)) // 定点协议机构编码（5位）+日期（8位）+流水号（7位）