commit

DataFusion/WebRoot/WEB-INF/classes/com/zskk/model/_DataDictionary.txt

@@ -21,6 +21,9 @@ Table: doctors
  doctor_role    | VARCHAR(20)   | YES  |     |         | 1.本地医生2.远程医生(可多选)
  login_failure  | INT(10)       | YES  |     |         | 登录失败次数  
  is_report      | VARCHAR(10)   | YES  |     |         | 是否能写报告  
+ exam_class     | VARCHAR(255)  | YES  |     | *       |         
+ send_sms       | INT(10)       | YES  |     | 0       |         
+ message_push   | VARCHAR(10)   | YES  |     | 0       |         
 ----------------+---------------+------+-----+---------+---------
 
 Table: exams
@@ -71,54 +74,60 @@ Table: exams
  updatedAt         | DATETIME(19)  | YES  |     |         |         
  delivery_doctor   | VARCHAR(100)  | YES  |     |         | 送诊医生    
  exam_report       | VARCHAR(10)   | YES  |     |         | 检查结果    
+ ext               | JSON          | YES  |     |         |         
+ id_card           | VARCHAR(50)   | YES  |     |         | 身份证号    
+ study_uid         | VARCHAR(100)  | YES  |     |         |         
 -------------------+---------------+------+-----+---------+---------
 
 Table: patient_infos
------------------+---------------+------+-----+---------+---------
- Field           | Type          | Null | Key | Default | Remarks 
------------------+---------------+------+-----+---------+---------
- id              | VARCHAR(32)   | NO   | PRI |         |         
- name            | VARCHAR(100)  | YES  |     |         | 患者姓名    
- sex             | VARCHAR(10)   | YES  |     |         | 性别      
- card_num        | VARCHAR(100)  | YES  |     |         | 身份证号    
- phone           | VARCHAR(20)   | YES  |     |         | 手机号     
- ctime           | DATETIME(19)  | YES  |     |         | 创建时间    
- birthday        | VARCHAR(20)   | YES  |     |         | 生日      
- age             | VARCHAR(10)   | YES  |     |         | 年龄      
- card_type       | VARCHAR(30)   | YES  |     |         | 证件类型    
- nationality     | VARCHAR(50)   | YES  |     |         | 国籍      
- nation          | VARCHAR(30)   | YES  |     |         | 民族      
- marry           | VARCHAR(10)   | YES  |     |         | 婚否      
- professional    | VARCHAR(100)  | YES  |     |         | 职业      
- address         | VARCHAR(255)  | YES  |     |         | 联系地址    
- temp_patient_id | VARCHAR(50)   | YES  |     |         | 检查临时患者id(从dicom影像中解析）
- status          | VARCHAR(10)   | YES  |     |         |         
- institution_id  | VARCHAR(200)  | YES  |     |         | 所属医院    
- anamnesis       | VARCHAR(2000) | YES  |     |         | 疾病史     
- family_ill      | VARCHAR(2000) | YES  |     |         | 家族史     
- createdAt       | DATETIME(19)  | YES  |     |         |         
- updatedAt       | DATETIME(19)  | YES  |     |         |         
------------------+---------------+------+-----+---------+---------
+-----------------+--------------+------+-----+---------+---------
+ Field           | Type         | Null | Key | Default | Remarks 
+-----------------+--------------+------+-----+---------+---------
+ id              | VARCHAR(32)  | NO   | PRI |         |         
+ name            | VARCHAR(100) | YES  |     |         | 患者姓名    
+ sex             | VARCHAR(10)  | YES  |     |         | 性别      
+ card_num        | VARCHAR(100) | YES  |     |         | 身份证号    
+ phone           | VARCHAR(20)  | YES  |     |         | 手机号     
+ ctime           | DATETIME(19) | YES  |     |         | 创建时间    
+ birthday        | VARCHAR(20)  | YES  |     |         | 生日      
+ age             | VARCHAR(10)  | YES  |     |         | 年龄      
+ card_type       | VARCHAR(30)  | YES  |     |         | 证件类型    
+ nationality     | VARCHAR(50)  | YES  |     |         | 国籍      
+ nation          | VARCHAR(30)  | YES  |     |         | 民族      
+ marry           | VARCHAR(10)  | YES  |     |         | 婚否      
+ professional    | VARCHAR(100) | YES  |     |         | 职业      
+ address         | VARCHAR(255) | YES  |     |         | 联系地址    
+ temp_patient_id | VARCHAR(50)  | YES  |     |         | 检查临时患者id(从dicom影像中解析）
+ status          | INT(10)      | NO   |     | 1       |         
+ institution_id  | VARCHAR(200) | YES  |     |         | 所属医院    
+ anamnesis       | VARCHAR(255) | YES  |     |         | 疾病史     
+ family_ill      | VARCHAR(255) | YES  |     |         | 家族史     
+ createdAt       | DATETIME(19) | YES  |     |         |         
+ updatedAt       | DATETIME(19) | YES  |     |         |         
+ ext             | JSON         | YES  |     |         |         
+-----------------+--------------+------+-----+---------+---------
 
 Table: report
--------------------+---------------+------+-----+---------+---------
- Field             | Type          | Null | Key | Default | Remarks 
--------------------+---------------+------+-----+---------+---------
- id                | VARCHAR(32)   | NO   | PRI |         | 报告id    
- report_datetime   | DATETIME(19)  | YES  |     |         | 报告时间    
- description       | TEXT(65535)   | YES  |     |         | 检查所见    
- impression        | TEXT(65535)   | YES  |     |         | 意见建议    
- img_url           | VARCHAR(1500) | YES  |     |         | 缩略图地址   
- exam_id           | VARCHAR(255)  | YES  |     |         | 检查表id   
- createdAt         | DATETIME(19)  | YES  |     |         |         
- report_doctor_id  | VARCHAR(255)  | YES  |     |         | 报告医生id  
- review_doctor_id  | VARCHAR(255)  | YES  |     |         | 审核医生id  
- qr_code           | VARCHAR(255)  | YES  |     |         | 二维码     
- report_result     | VARCHAR(255)  | YES  |     |         | 报告结果（阴阳性） 1阴性 2阳性
- review_datetime   | DATETIME(19)  | YES  |     |         | 审核时间    
- confirm_doctor_id | VARCHAR(50)   | YES  |     |         | 确认医生    
- confirm_datetime  | DATETIME(19)  | YES  |     |         | 确认时间    
--------------------+---------------+------+-----+---------+---------
+-----------------------+---------------+------+-----+---------+---------
+ Field                 | Type          | Null | Key | Default | Remarks 
+-----------------------+---------------+------+-----+---------+---------
+ id                    | VARCHAR(32)   | NO   | PRI |         | 报告id    
+ report_datetime       | DATETIME(19)  | YES  |     |         | 报告时间    
+ description           | TEXT(65535)   | YES  |     |         | 检查所见    
+ impression            | TEXT(65535)   | YES  |     |         | 意见建议    
+ img_url               | VARCHAR(1500) | YES  |     |         | 缩略图地址   
+ exam_id               | VARCHAR(255)  | YES  |     |         | 检查表id   
+ createdAt             | DATETIME(19)  | YES  |     |         |         
+ report_doctor_id      | VARCHAR(255)  | YES  |     |         | 报告医生id  
+ review_doctor_id      | VARCHAR(255)  | YES  |     |         | 审核医生id  
+ qr_code               | VARCHAR(255)  | YES  |     |         | 二维码     
+ report_result         | VARCHAR(255)  | YES  |     |         | 报告结果（阴阳性） 1阴性 2阳性
+ review_datetime       | DATETIME(19)  | YES  |     |         | 审核时间    
+ confirm_doctor_id     | VARCHAR(50)   | YES  |     |         | 确认医生    
+ confirm_datetime      | DATETIME(19)  | YES  |     |         | 确认时间    
+ type                  | VARCHAR(10)   | YES  |     | 1       | 报告类型    
+ remote_application_id | VARCHAR(50)   | YES  |     |         | 申请id    
+-----------------------+---------------+------+-----+---------+---------
 
 Table: studies
 ------------------+--------------+------+-----+---------+---------
@@ -139,5 +148,6 @@ Table: studies
  institution_id   | VARCHAR(200) | YES  |     |         |         
  createdAt        | DATETIME(19) | YES  |     |         |         
  updatedAt        | DATETIME(19) | YES  |     |         |         
+ ext              | JSON         | YES  |     |         |         
 ------------------+--------------+------+-----+---------+---------
 

DataFusion/WebRoot/WEB-INF/classes/config.properties

@@ -3,6 +3,6 @@ jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacsonline?characterEncoding
 user_zskk 	  = pacs
 password_zskk = ZSKK@2017~!@#
 
-jdbcUrl_connected  = jdbc:oracle:thin:@172.16.0.244:1521:orcl
-user_connected 	   = jiekou
-password_connected = another
+jdbcUrl_connected  = jdbc:sqlserver://192.168.0.1:1433;DatabaseName=hospital2007
+user_connected 	   = sa
+password_connected = xyy258

DataFusion/src/com/zskk/control/ViewController.java

@@ -17,7 +17,6 @@ import com.zskk.model.Studies;
 
 public class ViewController extends Controller {
 
-	
 	/**
 	 * 在被连接数据库执行sql语句
 	 */
@@ -27,6 +26,7 @@ public class ViewController extends Controller {
 			this.renderJson(d);
 		} catch (Exception e) {
 			// TODO: handle exception
+			
 			this.renderText(e.toString());
 		}
 	}
@@ -83,7 +83,7 @@ public class ViewController extends Controller {
 	
 	private String creatId() {
 		UUID id = UUID.randomUUID();
-        String[] idd =id.toString().split("-");
+        String[] idd = id.toString().split("-");
 		return idd[0]+idd[1]+idd[2];
 	}
 	
@@ -112,5 +112,5 @@ public class ViewController extends Controller {
 		}
         return date;
 	}
-	
+
 }

DataFusion/src/com/zskk/model/_DataDictionary.txt

@@ -21,6 +21,9 @@ Table: doctors
  doctor_role    | VARCHAR(20)   | YES  |     |         | 1.本地医生2.远程医生(可多选)
  login_failure  | INT(10)       | YES  |     |         | 登录失败次数  
  is_report      | VARCHAR(10)   | YES  |     |         | 是否能写报告  
+ exam_class     | VARCHAR(255)  | YES  |     | *       |         
+ send_sms       | INT(10)       | YES  |     | 0       |         
+ message_push   | VARCHAR(10)   | YES  |     | 0       |         
 ----------------+---------------+------+-----+---------+---------
 
 Table: exams
@@ -71,54 +74,60 @@ Table: exams
  updatedAt         | DATETIME(19)  | YES  |     |         |         
  delivery_doctor   | VARCHAR(100)  | YES  |     |         | 送诊医生    
  exam_report       | VARCHAR(10)   | YES  |     |         | 检查结果    
+ ext               | JSON          | YES  |     |         |         
+ id_card           | VARCHAR(50)   | YES  |     |         | 身份证号    
+ study_uid         | VARCHAR(100)  | YES  |     |         |         
 -------------------+---------------+------+-----+---------+---------
 
 Table: patient_infos
------------------+---------------+------+-----+---------+---------
- Field           | Type          | Null | Key | Default | Remarks 
------------------+---------------+------+-----+---------+---------
- id              | VARCHAR(32)   | NO   | PRI |         |         
- name            | VARCHAR(100)  | YES  |     |         | 患者姓名    
- sex             | VARCHAR(10)   | YES  |     |         | 性别      
- card_num        | VARCHAR(100)  | YES  |     |         | 身份证号    
- phone           | VARCHAR(20)   | YES  |     |         | 手机号     
- ctime           | DATETIME(19)  | YES  |     |         | 创建时间    
- birthday        | VARCHAR(20)   | YES  |     |         | 生日      
- age             | VARCHAR(10)   | YES  |     |         | 年龄      
- card_type       | VARCHAR(30)   | YES  |     |         | 证件类型    
- nationality     | VARCHAR(50)   | YES  |     |         | 国籍      
- nation          | VARCHAR(30)   | YES  |     |         | 民族      
- marry           | VARCHAR(10)   | YES  |     |         | 婚否      
- professional    | VARCHAR(100)  | YES  |     |         | 职业      
- address         | VARCHAR(255)  | YES  |     |         | 联系地址    
- temp_patient_id | VARCHAR(50)   | YES  |     |         | 检查临时患者id(从dicom影像中解析）
- status          | VARCHAR(10)   | YES  |     |         |         
- institution_id  | VARCHAR(200)  | YES  |     |         | 所属医院    
- anamnesis       | VARCHAR(2000) | YES  |     |         | 疾病史     
- family_ill      | VARCHAR(2000) | YES  |     |         | 家族史     
- createdAt       | DATETIME(19)  | YES  |     |         |         
- updatedAt       | DATETIME(19)  | YES  |     |         |         
------------------+---------------+------+-----+---------+---------
+-----------------+--------------+------+-----+---------+---------
+ Field           | Type         | Null | Key | Default | Remarks 
+-----------------+--------------+------+-----+---------+---------
+ id              | VARCHAR(32)  | NO   | PRI |         |         
+ name            | VARCHAR(100) | YES  |     |         | 患者姓名    
+ sex             | VARCHAR(10)  | YES  |     |         | 性别      
+ card_num        | VARCHAR(100) | YES  |     |         | 身份证号    
+ phone           | VARCHAR(20)  | YES  |     |         | 手机号     
+ ctime           | DATETIME(19) | YES  |     |         | 创建时间    
+ birthday        | VARCHAR(20)  | YES  |     |         | 生日      
+ age             | VARCHAR(10)  | YES  |     |         | 年龄      
+ card_type       | VARCHAR(30)  | YES  |     |         | 证件类型    
+ nationality     | VARCHAR(50)  | YES  |     |         | 国籍      
+ nation          | VARCHAR(30)  | YES  |     |         | 民族      
+ marry           | VARCHAR(10)  | YES  |     |         | 婚否      
+ professional    | VARCHAR(100) | YES  |     |         | 职业      
+ address         | VARCHAR(255) | YES  |     |         | 联系地址    
+ temp_patient_id | VARCHAR(50)  | YES  |     |         | 检查临时患者id(从dicom影像中解析）
+ status          | INT(10)      | NO   |     | 1       |         
+ institution_id  | VARCHAR(200) | YES  |     |         | 所属医院    
+ anamnesis       | VARCHAR(255) | YES  |     |         | 疾病史     
+ family_ill      | VARCHAR(255) | YES  |     |         | 家族史     
+ createdAt       | DATETIME(19) | YES  |     |         |         
+ updatedAt       | DATETIME(19) | YES  |     |         |         
+ ext             | JSON         | YES  |     |         |         
+-----------------+--------------+------+-----+---------+---------
 
 Table: report
--------------------+---------------+------+-----+---------+---------
- Field             | Type          | Null | Key | Default | Remarks 
--------------------+---------------+------+-----+---------+---------
- id                | VARCHAR(32)   | NO   | PRI |         | 报告id    
- report_datetime   | DATETIME(19)  | YES  |     |         | 报告时间    
- description       | TEXT(65535)   | YES  |     |         | 检查所见    
- impression        | TEXT(65535)   | YES  |     |         | 意见建议    
- img_url           | VARCHAR(1500) | YES  |     |         | 缩略图地址   
- exam_id           | VARCHAR(255)  | YES  |     |         | 检查表id   
- createdAt         | DATETIME(19)  | YES  |     |         |         
- report_doctor_id  | VARCHAR(255)  | YES  |     |         | 报告医生id  
- review_doctor_id  | VARCHAR(255)  | YES  |     |         | 审核医生id  
- qr_code           | VARCHAR(255)  | YES  |     |         | 二维码     
- report_result     | VARCHAR(255)  | YES  |     |         | 报告结果（阴阳性） 1阴性 2阳性
- review_datetime   | DATETIME(19)  | YES  |     |         | 审核时间    
- confirm_doctor_id | VARCHAR(50)   | YES  |     |         | 确认医生    
- confirm_datetime  | DATETIME(19)  | YES  |     |         | 确认时间    
--------------------+---------------+------+-----+---------+---------
+-----------------------+---------------+------+-----+---------+---------
+ Field                 | Type          | Null | Key | Default | Remarks 
+-----------------------+---------------+------+-----+---------+---------
+ id                    | VARCHAR(32)   | NO   | PRI |         | 报告id    
+ report_datetime       | DATETIME(19)  | YES  |     |         | 报告时间    
+ description           | TEXT(65535)   | YES  |     |         | 检查所见    
+ impression            | TEXT(65535)   | YES  |     |         | 意见建议    
+ img_url               | VARCHAR(1500) | YES  |     |         | 缩略图地址   
+ exam_id               | VARCHAR(255)  | YES  |     |         | 检查表id   
+ createdAt             | DATETIME(19)  | YES  |     |         |         
+ report_doctor_id      | VARCHAR(255)  | YES  |     |         | 报告医生id  
+ review_doctor_id      | VARCHAR(255)  | YES  |     |         | 审核医生id  
+ qr_code               | VARCHAR(255)  | YES  |     |         | 二维码     
+ report_result         | VARCHAR(255)  | YES  |     |         | 报告结果（阴阳性） 1阴性 2阳性
+ review_datetime       | DATETIME(19)  | YES  |     |         | 审核时间    
+ confirm_doctor_id     | VARCHAR(50)   | YES  |     |         | 确认医生    
+ confirm_datetime      | DATETIME(19)  | YES  |     |         | 确认时间    
+ type                  | VARCHAR(10)   | YES  |     | 1       | 报告类型    
+ remote_application_id | VARCHAR(50)   | YES  |     |         | 申请id    
+-----------------------+---------------+------+-----+---------+---------
 
 Table: studies
 ------------------+--------------+------+-----+---------+---------
@@ -139,5 +148,6 @@ Table: studies
  institution_id   | VARCHAR(200) | YES  |     |         |         
  createdAt        | DATETIME(19) | YES  |     |         |         
  updatedAt        | DATETIME(19) | YES  |     |         |         
+ ext              | JSON         | YES  |     |         |         
 ------------------+--------------+------+-----+---------+---------
 

DataFusion/src/com/zskk/model/_MappingKit.java

@@ -21,7 +21,7 @@ public class _MappingKit {
 		arp.addMapping("patient_infos", "id", PatientInfos.class);
 		arp.addMapping("report", "id", Report.class);
 		// Composite Primary Key order: id,studyuid
-		arp.addMapping("studies", "id", Studies.class);
+		arp.addMapping("studies", "id,studyuid", Studies.class);
 	}
 }
 

DataFusion/src/com/zskk/model/base/BaseDoctors.java

@@ -180,4 +180,31 @@ public abstract class BaseDoctors<M extends BaseDoctors<M>> extends Model<M> imp
 		return getStr("is_report");
 	}
 
+	public M setExamClass(java.lang.String examClass) {
+		set("exam_class", examClass);
+		return (M)this;
+	}
+	
+	public java.lang.String getExamClass() {
+		return getStr("exam_class");
+	}
+
+	public M setSendSms(java.lang.Integer sendSms) {
+		set("send_sms", sendSms);
+		return (M)this;
+	}
+	
+	public java.lang.Integer getSendSms() {
+		return getInt("send_sms");
+	}
+
+	public M setMessagePush(java.lang.String messagePush) {
+		set("message_push", messagePush);
+		return (M)this;
+	}
+	
+	public java.lang.String getMessagePush() {
+		return getStr("message_push");
+	}
+
 }

DataFusion/src/com/zskk/model/base/BaseExams.java

@@ -405,4 +405,31 @@ public abstract class BaseExams<M extends BaseExams<M>> extends Model<M> impleme
 		return getStr("exam_report");
 	}
 
+	public M setExt(java.lang.String ext) {
+		set("ext", ext);
+		return (M)this;
+	}
+	
+	public java.lang.String getExt() {
+		return getStr("ext");
+	}
+
+	public M setIdCard(java.lang.String idCard) {
+		set("id_card", idCard);
+		return (M)this;
+	}
+	
+	public java.lang.String getIdCard() {
+		return getStr("id_card");
+	}
+
+	public M setStudyUid(java.lang.String studyUid) {
+		set("study_uid", studyUid);
+		return (M)this;
+	}
+	
+	public java.lang.String getStudyUid() {
+		return getStr("study_uid");
+	}
+
 }

DataFusion/src/com/zskk/model/base/BasePatientInfos.java

@@ -144,13 +144,13 @@ public abstract class BasePatientInfos<M extends BasePatientInfos<M>> extends Mo
 		return getStr("temp_patient_id");
 	}
 
-	public M setStatus(java.lang.String status) {
+	public M setStatus(java.lang.Integer status) {
 		set("status", status);
 		return (M)this;
 	}
 	
-	public java.lang.String getStatus() {
-		return getStr("status");
+	public java.lang.Integer getStatus() {
+		return getInt("status");
 	}
 
 	public M setInstitutionId(java.lang.String institutionId) {
@@ -198,4 +198,13 @@ public abstract class BasePatientInfos<M extends BasePatientInfos<M>> extends Mo
 		return get("updatedAt");
 	}
 
+	public M setExt(java.lang.String ext) {
+		set("ext", ext);
+		return (M)this;
+	}
+	
+	public java.lang.String getExt() {
+		return getStr("ext");
+	}
+
 }

DataFusion/src/com/zskk/model/base/BaseReport.java

@@ -135,4 +135,22 @@ public abstract class BaseReport<M extends BaseReport<M>> extends Model<M> imple
 		return get("confirm_datetime");
 	}
 
+	public M setType(java.lang.String type) {
+		set("type", type);
+		return (M)this;
+	}
+	
+	public java.lang.String getType() {
+		return getStr("type");
+	}
+
+	public M setRemoteApplicationId(java.lang.String remoteApplicationId) {
+		set("remote_application_id", remoteApplicationId);
+		return (M)this;
+	}
+	
+	public java.lang.String getRemoteApplicationId() {
+		return getStr("remote_application_id");
+	}
+
 }

DataFusion/src/com/zskk/model/base/BaseStudies.java

@@ -144,4 +144,13 @@ public abstract class BaseStudies<M extends BaseStudies<M>> extends Model<M> imp
 		return get("updatedAt");
 	}
 
+	public M setExt(java.lang.String ext) {
+		set("ext", ext);
+		return (M)this;
+	}
+	
+	public java.lang.String getExt() {
+		return getStr("ext");
+	}
+
 }

DataFusion/src/com/zskk/tools/_JFinalDemoGenerator.java

@@ -38,7 +38,7 @@ public class _JFinalDemoGenerator {
 		// 设置是否生成链式 setter 方法
 		generator.setGenerateChainSetter(false);
 		// 添加不需要生成的表名
-		generator.addExcludedTable("bodypart","constant","department","device","doctor_class","dr_cla_permission","exam_class","exam_project","exam_subclass","images","institution","manager","menu","messages","operating","remote_application","report_record","series","sys_logs","sys_menus","templates");
+		generator.addExcludedTable("bodypart","constant","department","device","doctor_class","dr_cla_permission","exam_class","exam_project","exam_subclass","institution","manager","menu","messages","operating","remote_application","report_record","series","sys_logs","sys_menus","templates","bbs","images","open_application","oss_callbacks","user","user_bind","version","wechat_bind");
 		// 设置是否在 Model 中生成 dao 对象
 		generator.setGenerateDaoInModel(true);
 		// 设置是否生成链式 setter 方法
@@ -46,6 +46,7 @@ public class _JFinalDemoGenerator {
 		// 设置是否生成字典文件
 		generator.setGenerateDataDictionary(true);
 		// 设置需要被移除的表名前缀用于生成modelName。例如表名 "osc_user"，移除前缀 "osc_"后生成的model名为 "User"而非 OscUser
+		
 		generator.setRemovedTableNamePrefixes("t_");
 		// 生成
 		generator.generate();