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

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = prod
+runmode = dev
 
 #
 copyrequestbody = true

controllers/sg/his_api_controller.go

@@ -1779,7 +1779,7 @@ func (c *HisApiController) GetRegisterInfo() {
 				insutype = "310"
 			}
 
-			insutype = "390"
+			//insutype = "390"
 
 			//if count == 1 {
 			//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterRepeatException)
@@ -2037,14 +2037,14 @@ func (c *HisApiController) GetUploadInfo() {
 
 	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
 	fmt.Println(his_patient_id)
-	his, _ := service.GetHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	his, _ := service.GetNewHisPatientInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
 	timeFormat := tempTime.Format("20060102150405")
 	chrgBchno := rand.Intn(100000) + 10000
 	chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10) + strconv.FormatInt(his.PatientId, 10)
 	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, id, recordDateTime)
+	patientPrescription, _ := service.FindHisPatientPrescriptionInfo(adminUser.CurrentOrgId, his_patient_id, recordDateTime)
 	department, _ := service.GetDepartMentDetail(patientPrescription.Departments)
 	strconv.FormatInt(his.PatientId, 10)
 
@@ -2261,7 +2261,7 @@ func (c *HisApiController) GetUploadInfo() {
 					insutype = "310"
 				}
 
-				insutype = "390"
+				//insutype = "390"
 				if his.IdCardType == 1 {
 					cert_no = his.MedicalInsuranceNumber