Browse Source

电子病历提取数据元

xiaochan 1 year ago
parent
commit
f730ceaa6f

+ 8 - 5
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/emr/EmrPatientDao.java

@@ -59,10 +59,11 @@ public interface EmrPatientDao {
     Integer whetherThereIsAMedicalRecord(@Param("docmentId") String docmentId);
 
     @Insert("insert into emr_patient_data (pat_no, times, emr_document_id," +
-            " emr_category_code, emr_name,create_id,name,parent,refer_physician,consult_physician,dept_director) " +
+            " emr_category_code, emr_name,create_id,name,parent,refer_physician,consult_physician,dept_director , " +
+            " emr_data_element) " +
             "values (#{patNo},#{times},#{emrDocumentId}," +
-            "#{emrCategoryCode},#{emrName},#{createId},#{name},#{parent},#{referPhysician},#{consultPhysician},#{deptDirector})")
-    @Options(useGeneratedKeys = true, keyColumn = "id", keyProperty = "id")
+            "#{emrCategoryCode},#{emrName},#{createId},#{name},#{parent},#{referPhysician},#{consultPhysician},#{deptDirector}, " +
+            "#{emrDataElementStr})")
     void emrInsertForTheFirstTime(EmrPatientData param);
 
     @Delete("delete emr_progress_note where document_id = #{documentId} ")
@@ -84,7 +85,8 @@ public interface EmrPatientDao {
     @Update("update emr_patient_data " +
             "set name    = #{name}, " +
             "    modify_date = getdate() , " +
-            "    modify_id   = #{createId} " +
+            "    modify_id   = #{createId} , " +
+            "    emr_data_element = #{emrDataElementStr} " +
             "where pat_no = #{patNo} " +
             "  and times = #{times} " +
             "  and emr_document_id = #{emrDocumentId} ")
@@ -161,7 +163,7 @@ public interface EmrPatientDao {
     List<String> getDocumentIdByPatietn(String patNo, int times, String categoryCode);
 
     @Select("select data_element from emr_data_element where pat_no = #{patNo} and times = #{times} ")
-    String getEmrPatientData(@Param("patNo") String patNo,@Param("times") int times);
+    String getEmrPatientData(@Param("patNo") String patNo, @Param("times") int times);
 
 
     @Select("select top 1 rtrim(a.name)                                                                                          as xm, " +
@@ -540,6 +542,7 @@ public interface EmrPatientDao {
             "where inpatient_no = #{patNo} " +
             "  and admiss_times = #{times}")
     List<OpRecord> getOpRecordList(String patNo, Integer times);
+
     @Select(" select *  from emr_patient_data where pat_no=#{patNo} and del_flag=0")
     List<MzEmrPatientData> selectDataByPatNo(String patNo);
 

+ 2 - 0
src/main/java/thyyxxk/webserver/entity/datamodify/YzActOrder.java

@@ -248,6 +248,8 @@ public class YzActOrder implements Serializable {
                 return "基数药";
             case "4":
                 return "出院带药";
+            case "5":
+                return "GCP自费";
             default:
                 return "";
         }

+ 8 - 0
src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/emr/EmrPatientData.java

@@ -100,6 +100,8 @@ public class EmrPatientData implements Serializable {
      */
     private JSONObject emrDataElement;
 
+    private String emrDataElementStr;
+
     /**
      * 是否提交
      */
@@ -160,4 +162,10 @@ public class EmrPatientData implements Serializable {
         return "category";
     }
 
+    public String getEmrDataElementStr() {
+        if (emrDataElement != null) {
+            return emrDataElement.toString();
+        }
+        return "";
+    }
 }

+ 0 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrServer.java

@@ -261,7 +261,6 @@ public class EmrServer {
 
         param.setCreateId(TokenUtil.getInstance().getTokenUserId());
         Integer isUpdated = dao.whetherThereIsAMedicalRecord(param.getEmrDocumentId());
-
         if (isUpdated != null) {
             dao.updateCreatedTemplate(param);
             insertAFragmentOfTheCourseOfTheDisease(isUpdated, param.getFragment());